Hide empty contexts in Context-based perspectives

I have a perspective with these settings. The resulting perspective looks like this.

I find it annoying that I have to see these huge contexts that have nothing in them. (Eg. Errands, Home : Phone, Home : Mac). If I set Filter Contexts to “Active”, it removes, in this case, Home : Phone and Home : Mac, but Errands remains. Ideally, I’d only see Errands : Columbia, and Errands would be hidden as well.

I moved 3 posts to an existing topic: r209302 introduces unwanted context titles to be viewed in perspective [Workaround available]