added support for city-names with more than one word