Resolved findbugs issues in query package