Filtering - if I only have 'Product' workspaces defined in my Aha instance, don't show me filters for business/marketing/it/services/project

Specifically for Features & Master Feature Filters - when the new workspaces were added a couple of weeks ago, a lot of new filters relating to them were added too.  The list when from ~20-30 choices to ~80+ choices.  

Since I don't have these other workspace types, all these other filters are quite irrelevant - but I still need to scroll thru them each time to get to 'feature status' filter for example.  Need to explain to users what these new choices are, why they need to ignore them - creates confusion. 

In addition - the order of the sub groups displayed in the list has changed for the worse.  When I click on 'Filter by Feature', I'd expect that filters relating to Feature will be at the top of the list.  They were before, but now they are most of the way to the bottom of the list.  A step backwards in usability.  

I'd prefer that records relating to other workspace types only be shown, if a workspace of that type exists on my site.