mods in support of cgimap based export