Small tweaks to the filter