Bug 22527: (RM follow-up) Add filter