Refactored filters.