Fixes bug where **previously** selected instead of current filter had been selected when **scrubbing** through filter list. Also fixes bug where filter had not been saved when first filter-rule was added on empty filter.