- improve filemarker handling