Improvement to Filter & Aggregation selection

Applying a filter or label aggregation no longer comes with the 'reset' option on the main grid, so the only way to know is to look out for the numbers i.e. Filters (1) and I think this button should be blue to denote it's on.

And then when you click to open the modal again, it should automatically expand the tab(s) where the filters/labels are applied to it's obvious.