Country and City controller fixes