When switching vaults, do not default Categories to "All Categories"

Thanks ag_mike_d I added Categories to the sidebar as you mentioned. That is useful, however it doesn't solve my issue. In fact, I would add two similar comments/requests on the behavior:
1) If I first select a Vault on the sidebar, and then a Category, I would expect the Vault selection to stay active. What I see is that upon selecting a Category, it defaults back to All Vaults.
2) When choosing a Category on the sidebar, there is no way to then filter by vaults (as compared to selecting a Vault or a Tag in the sidebar, which then gives you the chance to filter by Category at top).