XD-1469: Fix aggreator correlation