Improving query-validator modules and fixes test case

https://issues.apache.org/jira/browse/USERGRID-12