fix some working set view issues

Fixes #9019 
Fixes #8973
Fixes #9032

@JeffryBooher  Why did you add a space at end of comment open delimiter here? I cleaned up a bunch of those in another PR.