fix some working set view issues

Fixes #9019 
Fixes #8973
Fixes #9032

i'm pretty sure that brackets did this on its own :)  Looks like it did something similar on line 97.