Fix handling of custom filter attributes