Fix some error.  Refs #6694.
Merge branch 'wzhou/6694_genfilter' into develop