Bug 18591: (RM follow-up) Fix filter