WF-1609 combobox code fixed