Revert "Fix city name"

This reverts commit 8928b72b073885da88928417c1c37249fa298c77.
Revert "Revert "Fix city name""

This reverts commit 6c2afc24284853042fda98dd6959cec4ff26a8d6.