crm_city final fixes 3