Removed HostPathWS dependency from pom.xml (only need 'nouns')
Improved checking of allowable query field names