Drill-Through not simple Measure

Hi Community,

I've created a report that sumarizes the amounts of tenders submitted, awarded, cancelled, etc.

This is part of my E-R Diagram 

I get the info for each opportunity from the table "Oportunidades"

From "EstOp" I get whether it's a proposal, pre-proposal info or several other things (I'm taking the proposals)

From "StatCom" I get the status of the proposal (awarded, cancelled, submitted, etc.)

And I have three relationships with the Calendar table because I need to control the proposal notification, submission and award dates.

I got the report with all the summarized info based on proposal submission and award dates to be chosen by the user. I also take other filters into account such us the country or the geographical area where they were submitted. Here's the report:

In order to achieve this I use a measure for each column so I can choose which relation with the Calendar table is the active one. Here's an example of the code I use for the column of ongoing proposals:

I'm basically checking by which date I want to filter the data and then count the Unique ID of the table "Oportunidades" for every row that meets the condition of being a proposal and that it's ongoing.

I repeat this code for each of the measures and modify what I'm looking for in the StatCom table.

My problem is that now I want to drill-through the elements on my visual so I can get a detail table with the project name, country, budget, etc for the year and StatCom that I selected. However, drill-through doesn't seem to work properly on measures if they're not a simple SUM or COUNT and what I'm getting is a list with every single row in table "Oportunidades".

Does anyone know a good way to solve this?

Thank you