Fix comboboxes. Close #97 and close #98