Rank Comparison Current Year Vs Last Year

Hi, I´m trying to learn, and I appreciate any collaboration.

I find out a way for ranking top sales and grouping “other” clients ranked in an lower position.

I have a Sales Table, which contains the Total Amount Sales for each Client along time.

First, I create two tables for Ranking position from 1 to 15 and “Others” {1,2,3, …, 14, 15, “Others”} with the Min and Max fields which allows to group “other” clients beyond 15. I create one table for the current year, and another for the last year, as along time the ranking order is different for a same Client.

Then I create the next two measures, both for the current year and for the previous year (so, there are four measures).

Then I used the Matrix Visualization, and the result was amazing. I'm very close to achieving it.

Now the problem is that the current and the previous year rankings in the Matrix and are not working independently. So, it does not show me the NAME of the clients and it Sales Amount in the Clients that in the previous year where not within 15 of the current year Ranking. I need to treat the Client Name independently, and I think that I must modify something in the “Show Client” criteria of the Previous Year. I´m using the same formula of the case for showing both current and previous year.

Then, I also looking forward to getting the information ordered by the Current Year Ranking, and the related information of the previous year. Just like the next image:

In this case, if the Rank position is over 15, instead of showing the order number we can think in using a text like "Over 15"

Thanks a lot for any help or advise!