Bug 23590: (QA follow-up) Add missing filters and drop script type