Finish filter tree refactor.