Minor CHbenCHmark fixes

CH-queries work more like they were intended to now.