changed Combobox with types of entities. Deletion fix