INT-3465:Content Enricher Improvements