General cleanup, more attr use in custom filters, and refactoring of custom filter mapper (no race conditions now)
Merge pull request #1870 from reciprocity/feature/custom-filter-listens-to-changes

CustomFilter mapper fixes