fix some working set view issues

Fixes #9019 
Fixes #8973
Fixes #9032
Fixes #9142
That's a great explanation that belongs in the code somewhere!