changed city to city+country