escape names for tooltip in maps
Merge branch 'master' into production