fix issue with aggregation bubble IDs
optimize somehow the aggregation (still issues on huge loads of data)