Fixed COUNT aggregation function
Merge branch 'grouping'