multiselect entities, third round of changes