Bug 305807: Fix some incorrect template filtering types - Patch by GavinS <bugzilla@chimpychompy.org> r=LpSolit r=justdave a=justdave