When aggregates are calculated on an intersection the normal grouping is modified but not restored

[acuthbert]

calculateAggregates removes the default group using the unique identifier for it's own purpose, but doesn't add it back meaning if you use the collection for iteration, you may get duplicates.