Adds ExpectedFilter functionality
Minor tweaks to expected filters functionality