More logical filter handling