Added filter for aggregator