Filter function updates
Merge branch 'ycastillo-1.9.x.1' into 1.9.x - refs #2238
Minor code style fixes and 1 comment