Add checking for city name.