Change to clause-based filter system