crm_city final fixes 2