Bug 20312: Add missing filters