added support for city names