Grouped data bugfixes

https://trello.com/c/F53ywENK/4429-report-builder
Nice find. Forgot to remove it when I was testing it…