Fix cluster enrich