Bug 18421: (follow-up) Adding missing filters