markup fix
combo fix
combobox fix