#1260 closes #1252 fixes #992 - retrieve option text as value when value is not defined