Refactor focussed feature filtering, change modes when unfocussed, fix tests