General cleanup, more attr use in custom filters, and refactoring of custom filter mapper (no race conditions now)