Revert "Corrections to new filters."

This reverts commit a985bafab182aa577b5a3a7494f06726f732aadc.
Revert "Revert "Corrections to new filters.""

This reverts commit 2076bd5daa748349a09291fb67222f7051e1dc19.
Revert "Revert "Revert "Corrections to new filters."""

This reverts commit 3781e2bd682cacfd58f2d256832d472b241e521d.