Allow more than 2 additional GROUP BY columns

It seems that there is a limit to the number of columns that can be grouped by; you can group by `time` and two other columns, but not more than that.

I have a need to be able to group by up to 4 additional columns (so 5, including `time`), but it would probably be better to remove the restriction altogether, if that is possible.

Thanks!
