Fold two more SQL queries into the query object
Merge pull request #165 from kytrinyx/more-context-sql

Fold two more SQL queries into the query object