XSD Updated to allow more powerful regex matching against query strings
Updated tests
Updated unit tests
Updated code