removed bug with city name and 500 page