fix some working set view issues

Fixes #9019 
Fixes #8973
Fixes #9032

I'm seeing that case 4 is fixed, but case 3 is now broken.