Country data now come from city database