NXP-15011: change way of accessing available aggregate results with a map