Add support for city name with spaces