removed overcomplication of abp filters code + fixed potential false negatives