CE-1018 Base update only on city_id
CE-1018 City-Category mapping updates