Power BI Bookmarks for grouped visuals

I will try to explain the problem a bit better here, as well as provide my current work-around.

GROUP 1:

Drop-down slicer set to single select, filters "Percentile"

Multi-Select list slicer, filters "Node"

Graph with X-Axis of "Date", Y-Axis of "Price", and "Node" as legend

Table with "Date", "Price", "Node" as columns

GROUP 2:

Drop-down slicer set to single select, filters "Node"

Multi-Select list slicer, filters "Percentile"

Graph with X-Axis of "Date", Y-Axis of "Price", and "Percentile" as legend

Table with "Date", "Price", "Percentile" as columns

This allows two views, for each group. One where you can see the data as a table, one where you can see it as a graph.

(Note: the table is behind the graph in both visuals)

Now it is easy enough to set up bookmarks to switch between the two by setting them to selected visuals and display only, then changing visibility and setting the bookmark.

Show Group 1:

Group 1 => Visible

Group 2 => Hidden

Show Group 2:

Group 1 => Hidden

Group 2 => Visible

(note that none of the individual items within the group were selected when setting these bookmarks, only the group itself)

Then I want to add an option to switch between viewing the graph and the table, so I add two more bookmarks,  both set to Selected Visuals, and Display.

Show Table:

All Graphs => Hidden

All Tables => Visible

Show Graph:

All Graphs => Visible

All Tables => Hidden

Now the issue emerges:

1) I select "Show Group 1", then switch to "Table", I see the group 1 table:

(Note that selecting "Show Table" also affects the visibility of Group 2 Graph and Tabe, as intended)

2) I select "Show Group 2". I don't see the table, but instead the graph, even though the table was visible and the graph was hidden in the previous step. This is NOT the inteded behaviour.

In changing to "Show Group 2", the visibility of individual group 1 and group 2 items was changed, rather than just the group visibility.

This is the issue.

The Solution:

Instead of using a bookmark navigator for the "Show Graph" and "Show Table" bookmarks, use buttons. This way they are not highlighted when clicked, so do not imply that they remember their state when switching between group 1 and group 2.