Resolved findbugs issues in query package
Merge pull request #1680 from pveentjer/findbugs-query

Resolved findbugs issues in query package