Fixing up enrichment on analyze page.