fix a couple of working set view issues