Refactor filter params