Made location validations less stringent for actual data