fix some working set view issues

Fixes #9019 
Fixes #8973
Fixes #9032

this is what the old master did, btw.