cleanup in map generation code
support for multilingual reports