[data] cleanup: use SortKey instead of mixed typing in aggregation

[data] cleanup: use SortKey instead of mixed typing in aggregation #8033