fixing adp filter bugs, at least one left