Fixes #208, #205, #189, and other changes related to better integrate ABP filters