Grouped data bugfixes

https://trello.com/c/F53ywENK/4429-report-builder
Same as above.