Added handling of multiword countries.