fix some working set view issues

Fixes #9019 
Fixes #8973
Fixes #9032

I've never seen this in any other code review. Maybe an extension? Maybe a recently introduced bug?