Refactored filters