Minor updates to the new filter