Change the city and city_ref field to city_id field