Fix issue where grouping without an aggregate value results in empty results
Make long list of dimensions more palatable