Bug 20726: (RM follow-up) Add missing filters