Filter by tweaks

Refs #8323