[SUREFIRE] FilterFactory improvement