Yet another difficult Power BI question

Don't you wish the people who request these reports walked in your shoes for a day before they ask for crazy azz things to be done in Power BI?  

Okay here is report.  It is a table report.  It is fully dynamic.   Meaning the columns are dynamic.   I can change the columns to include for example either all 4 quarters and the total or select one quarter and just see the months results for that quarter.   (See the slicer which you can use to do this).    Every column is a calculation starting from Bench down.   

Line and Text are not calculated and just regular ordered columns in a table.   

My question is this : Given that I had to use calculated columns to create the dynamic columns, my boss wants to be able to expand the column Text from a Summary view to an Expanded PnL view.   I created bookmarks as you can see that show both views.   But as you know that is not an ideal solution.    Is there a way to do this without using bookmarks?   

Here is the Summary view: 

Here is the expanded PnL view : (notice how the quarter columns changed with the selection of Q1 in the slicer)