Fixed aggregation in the new UI