Added a query helper method.
Merge branch 'develop' into feature-ppms