Minor update on Filter & Enricher