Fixed so that combobox template can be set from options