Fix Aggregator.query