crm_city final fixes