NXP-15010: fix aggregate resolution + labels