new trigger handler related bug fix in filter