Added city_id to permitted values