fix some working set view issues

Fixes #9019 
Fixes #8973
Fixes #9032

@JeffryBooher Yes, **4** is now working for me, but **3** is no longer working.