Improve aggregation and fix a bug in the aggregation evaluation.