Finish migration of relevant things to QueryRunner so it compiles

I assume that we should ensure that this is fullfilled before creating the TsdbQuery, it should be the best way to ensure that we never get here