Bug 21156: (RM follow-up) Correction to added filters