Enhance Country and City form