fix some working set view issues

Fixes #9019 
Fixes #8973
Fixes #9032
Fixes #9142
@JeffryBooher this is fine as long as it's still behaves and looks the same.