Fix validation for state and country_slug