Enrichment UI fixes