WIP - improve filter efficiency by avoiding 2-filter chain for BPF