TODO update
Stop using comma delimiter in choice list widget