Fixing city and country search on advanced search