Fixed query 10 of CHBench
Minor fixes for queries 4,5,7,8 and 22