fix some working set view issues

Fixes #9019 
Fixes #8973
Fixes #9032

It's fixed. I guess I didn't pull latest change.