Cleaning

Clean a bit the enrichment + fixed temporarily the transform issue in ListToSet