Issue #1790298 by nagba, pwolanin: Unindexed query in aggregator module.