Fix for city names