add country
improve set city for set country