Fixes and optimizes aggregation