Modified validation for location