Better way to share queries across teams?

Hi,

We have a team structure like this:

Top Team
- Sub Team A
- Sub Team B

I have some queries that are saved and shared with "Top Team". But if a user logs in, and they are only a member of "Sub Team A", then they only see the shared queries of "Sub Team A"

I would like for any person who is a member of a sub team, to get all of the shared queries of "Top Team" on their work items web page. In other words, their list of shared queries should be "Predefined", "Top Team", and "Sub Team A". Is there any way to do that?

So far, every time I create a query, I have to share it with all teams, and this is becoming a a real maintenance headache.