Some CHBenChmark query fixes.

The queries behave now more like they where intended to do.