Added trace filtering