Some CHBenChmark query fixes.

The queries behave now more like they were intended to do.

EDIT: Pushed another change to master and it landed in this commit. I'll reopen it wit ha fresh branch.