1 filter rather than 2 Closes #5361