Fixes for select + support for users' templates for entity-list