Make County and CountryId required