fixes #2207 select editables with values and options
update the options value to contain values and labels
Merge pull request #2208 from ScottDowne/t2207

fixes #2207 select editables with values and options