CON-105: change a way to set selected option in select field