Added some more filtering parameters for speed