Zip code and city name bug fixed