Fix #1606 Counts are not correct in the aggregate view
Test foiFix #1606 Counts are not correct in the aggregate view
Merge pull request #1617 from dennishendriksen/master

Fix #1606 Counts are not correct in the aggregate view