Fix aggregates #2271
Merge pull request #1158 from dennishendriksen/feature/genericdataexplorer

Fix aggregates #2271