Fixed bug causing incorrect match of selected values to select options.