TomSelect option display

[ric2016]

When presenting a list of options, such as individuals, the entries are formatted nicely (e.g. via TomSelectIndividual.php returning html code via individual.phtml). In the options list, this formatting is lost (probably because the option tag doesn't support inner tags).

See e.g. a chart on the demo server:

Formatted:

Plain (after selecting an entry and submitting via 'view'):

Perhaps move the formatting out of the option element, as described here (under 'Data-* Attributes')?