Add multiselect
Update Icons and entity selection