Sort initial query by city then country
Whoops. Sort by country then city