Fix working set containing Bonita Home