Filtering Triggers - fixed #47 + merge from TB 2 -> TB 3