Added Aggregation filtering