Rework and refactor filter view