Better filter. Closes #3249