Enricher

INT-3465:Content Enricher Improvements
Nit picky: looks bad from code format.