Add:separate file for gendocx fixed - current issues