Aggregation on different levels

Use case: Display top 4 countries by number of sales, with aggregate sales amount and number of account responsibles per country.

This requires aggregation on two different levels:

• per distinct account responsible per country
• per country

This can be achieved with a concat transformation inside groupby

$apply=groupby((Country),concat(
  groupby((AccountResponsible))/aggregate($count as number_of_leaves),
  aggregate(SalesNumber,SalesAmount)
))
/orderby(SalesNumber desc)/top(4)

that returns two rows per country

But then the subsequent orderby cannot sort the countries, because each country occupies two rows. Before the orderby, the table would need to be compressed into

One way to achieve this is

$apply=groupby((Country),concat(
  groupby((AccountResponsible))/aggregate($count as number_of_leaves),
  aggregate(SalesNumber,SalesAmount)
)/aggregate(
  number_of_leaves with max as number_of_leaves2,
  SalesNumber with max as SalesNumber2,
  SalesAmount with max as SalesAmount2
))
/orderby(SalesNumber2 desc)/top(4)

But this is cumbersome and requires renaming the properties.

Can [OData-Aggr] offer a more elegant solution?