Replace `entity` with `choose` elements to avoid duplicates

Don't collect multiple values, but use DBS if available, else Sigel