Refactoring evalGroupByClause + fix timings data returned by QueryResults