Issue #2127725 by ParisLiakos: Remove category handling from aggregator.