Make query helper static
Merge pull request #62 from golyshevd/q

Make query helper static