change city to city_id