CRM-13966 - select2 improvements