Fix - Faster Enriching - Fast Enrich now do tags correctly