Finish migration of relevant things to QueryRunner so it compiles
Merge pull request #42 from hi3g/next_query_queryrunner

Finish migration of relevant things to QueryRunner so it compiles