updated generic enrichment dialog: improved entity selection for building an enrichment query