Fix handling of country names