Updated to use https://github.com/koenpunt/chosen, branch 'option_adding'