crm_city final fixes 4