fix two working set view issues

Fixes #9019 
Fixes #8973