Filter function updates

Files with corrections #2238.