changes to filter handling