Workaround for a circular reference

I've gotten myself into a bit of a mess and I need some help. I've been thinking of a solution for this but no luck.
You can see some calculations and some filters performed on the given rows. Everything works fine, as in, the calculations are updated based on the filtered data (press buttons).
What I am trying to do is add another button to filter by the "S" column and have the calculations only take into account the "filtered by "S"" data, if possible without changing the formulae on the next sheet, because I want one set of formulas to adapt to every kind of filtered data (by surface, by date, by the S column, etc). I know this is very hard because this is an obvious circular reference, but... I was hoping there is some kind of workaround.
Thanks for your time
Edit: here is an example of the 'BY S' column filter would look like, but the problem with is that - it does not affect the calculations.

Please Login or Register  to view this content.

Is this solved?

If you solve a problem yourself before anyone else has responded, please take a moment to describe your solution, chances are some other member will benefit.