- refactored query helper, no longer tied to only the select query
- updated unittests and examples to reflect the refactored query helper