MapperGeo & ModuleUploader - fix