Enricher

INT-3465:Content Enricher Improvements
Rephrase, please. Now it sounds like the entire `expression` will be returned.