Bug 22087: Add missing filters