Refactored filter setup