preconfiguredChoices: Set based on UUID, not description

preconfiguredChoices were previously being matched via description
strings, which was error-prone. This replaces matching with precise
UUID matches instead.