Bug 17492: (follow-up) Add missing filters