[Bug 1015334] Workaround mapbox multiple-city-with-same-name issue, and cosmetic/l10n tweaks.
Merge pull request #962 from Sancus/geofixes

[Bug 1015334] Workaround mapbox multiple-city-with-same-name issue, and cosmetic/l10n tweaks.