Really fix handling of country in Geocoder class