diff --git a/projects/admin/src/app/app.module.ts b/projects/admin/src/app/app.module.ts
index f27367881..53db7bdae 100644
--- a/projects/admin/src/app/app.module.ts
+++ b/projects/admin/src/app/app.module.ts
@@ -1,7 +1,7 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2019-2022 RERO
- * Copyright (C) 2019-2022 UCLouvain
+ * Copyright (C) 2019-2023 RERO
+ * Copyright (C) 2019-2023 UCLouvain
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
  */
 
 import { APP_BASE_HREF, PlatformLocation } from '@angular/common';
-import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from '@angular/common/http';
 import { APP_INITIALIZER, CUSTOM_ELEMENTS_SCHEMA, LOCALE_ID, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
@@ -44,13 +44,10 @@ import {
   SelectAccountEditorWidgetComponent
 } from './acquisition/components/editor/widget/select-account-editor-widget/select-account-editor-widget.component';
 import { ReceivedOrderPermissionValidator } from './acquisition/utils/permissions';
-import { PaymentsDataComponent } from './record/search-view/patron-transaction-event-search-view/payments-data/payments-data.component';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { DocumentsTypeahead } from './classes/typeahead/documents-typeahead';
 import { ItemsTypeahead } from './classes/typeahead/items-typeahead';
-import { MefOrganisationTypeahead } from './classes/typeahead/mef-organisation-typeahead';
-import { MefPersonTypeahead } from './classes/typeahead/mef-person-typeahead';
 import { MefTypeahead } from './classes/typeahead/mef-typeahead';
 import { PatronsTypeahead } from './classes/typeahead/patrons-typeahead';
 import { TabOrderDirective } from './directives/tab-order.directive';
@@ -72,7 +69,7 @@ import { ItemInCollectionPipe } from './pipe/item-in-collection.pipe';
 import { MainTitleRelationPipe } from './pipe/main-title-relation.pipe';
 import { MarcPipe } from './pipe/marc.pipe';
 import { NotesFormatPipe } from './pipe/notes-format.pipe';
-import { SubjectProcessPipe } from './pipe/subject-process.pipe';
+import { PatronNamePipe } from './pipe/patron-name.pipe';
 import { CircPoliciesBriefViewComponent } from './record/brief-view/circ-policies-brief-view.component';
 import { CollectionBriefViewComponent } from './record/brief-view/collection-brief-view.component';
 import { DocumentsBriefViewComponent } from './record/brief-view/documents-brief-view/documents-brief-view.component';
@@ -82,10 +79,15 @@ import { ItemTypesBriefViewComponent } from './record/brief-view/item-types-brie
 import { ItemsBriefViewComponent } from './record/brief-view/items-brief-view/items-brief-view.component';
 import { LibrariesBriefViewComponent } from './record/brief-view/libraries-brief-view.component';
 import { LoansBriefViewComponent } from './record/brief-view/loans-brief-view/loans-brief-view.component';
+import { PatronTransactionEventDefaultComponent } from './record/brief-view/patron-transaction-events-brief-view/patron-transaction-event-default.component';
+import { PatronTransactionEventOverdueComponent } from './record/brief-view/patron-transaction-events-brief-view/patron-transaction-event-overdue.component';
+import { PatronTransactionEventsBriefViewComponent } from './record/brief-view/patron-transaction-events-brief-view/patron-transaction-events-brief-view.component';
 import { PatronTypesBriefViewComponent } from './record/brief-view/patron-types-brief-view.component';
 import { PatronsBriefViewComponent } from './record/brief-view/patrons-brief-view/patrons-brief-view.component';
 import { TemplatesBriefViewComponent } from './record/brief-view/templates-brief-view.component';
 import { VendorBriefViewComponent } from './record/brief-view/vendor-brief-view.component';
+import { CirculationLogLoanComponent } from './record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component';
+import { CirculationLogNotificationComponent } from './record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component';
 import { CirculationLogComponent } from './record/circulation-logs/circulation-log/circulation-log.component';
 import { CirculationLogsDialogComponent } from './record/circulation-logs/circulation-logs-dialog.component';
 import { CirculationLogsComponent } from './record/circulation-logs/circulation-logs.component';
@@ -150,18 +152,24 @@ import { LocalFieldComponent } from './record/detail-view/local-field/local-fiel
 import { LocationDetailViewComponent } from './record/detail-view/location-detail-view/location-detail-view.component';
 import { OrganisationDetailViewComponent } from './record/detail-view/organisation-detail-view/organisation-detail-view.component';
 import { PatronDetailViewComponent } from './record/detail-view/patron-detail-view/patron-detail-view.component';
+import { PatronPermissionComponent } from './record/detail-view/patron-detail-view/patron-permissions/patron-permission/patron-permission.component';
+import { PatronPermissionsComponent } from './record/detail-view/patron-detail-view/patron-permissions/patron-permissions.component';
 import { PatronTypesDetailViewComponent } from './record/detail-view/patron-types-detail-view/patron-types-detail-view.component';
 import { PermissionDetailViewComponent } from './record/detail-view/permission-detail-view/permission-detail-view.component';
 import { RecordMaskedComponent } from './record/detail-view/record-masked/record-masked.component';
 import { TemplateDetailViewComponent } from './record/detail-view/template-detail-view/template-detail-view.component';
 import { VendorDetailViewComponent } from './record/detail-view/vendor-detail-view/vendor-detail-view.component';
-import { DocumentRecordSearchComponent } from './record/search-view/document-record-search/document-record-search.component';
 import { IdentifiedbyValueComponent } from './record/editor/wrappers/identifiedby-value.component';
 import { UserIdComponent } from './record/editor/wrappers/user-id/user-id.component';
 import { CipoPatronTypeItemTypeComponent } from './record/formly/type/cipo-patron-type-item-type/cipo-patron-type-item-type.component';
 import { ItemAvailabilityComponent } from './record/item-availability/item-availability.component';
 import { OperationLogsDialogComponent } from './record/operation-logs/operation-logs-dialog/operation-logs-dialog.component';
 import { OperationLogsComponent } from './record/operation-logs/operation-logs.component';
+import { DocumentRecordSearchComponent } from './record/search-view/document-record-search/document-record-search.component';
+import { PatronTransactionEventSearchViewComponent } from './record/search-view/patron-transaction-event-search-view/patron-transaction-event-search-view.component';
+import { PaymentsDataComponent } from './record/search-view/patron-transaction-event-search-view/payments-data/payments-data.component';
+import { PaymentDataPieComponent } from './record/search-view/patron-transaction-event-search-view/payments-data/pie/payment-data-pie.component';
+import { PaymentsDataTableComponent } from './record/search-view/patron-transaction-event-search-view/payments-data/table/payments-data-table.component';
 import { AppConfigService } from './service/app-config.service';
 import { AppInitializerService } from './service/app-initializer.service';
 import { OrganisationService } from './service/organisation.service';
@@ -170,17 +178,6 @@ import { UiRemoteTypeaheadService } from './service/ui-remote-typeahead.service'
 import { CurrentLibraryPermissionValidator } from './utils/permissions';
 import { CustomShortcutHelpComponent } from './widgets/custom-shortcut-help/custom-shortcut-help.component';
 import { FrontpageComponent } from './widgets/frontpage/frontpage.component';
-import { PatronTransactionEventsBriefViewComponent } from './record/brief-view/patron-transaction-events-brief-view/patron-transaction-events-brief-view.component';
-import { PatronNamePipe } from './pipe/patron-name.pipe';
-import { PatronTransactionEventOverdueComponent } from './record/brief-view/patron-transaction-events-brief-view/patron-transaction-event-overdue.component';
-import { PatronTransactionEventDefaultComponent } from './record/brief-view/patron-transaction-events-brief-view/patron-transaction-event-default.component';
-import { PatronTransactionEventSearchViewComponent } from './record/search-view/patron-transaction-event-search-view/patron-transaction-event-search-view.component';
-import { PaymentsDataTableComponent } from './record/search-view/patron-transaction-event-search-view/payments-data/table/payments-data-table.component';
-import { PaymentDataPieComponent } from './record/search-view/patron-transaction-event-search-view/payments-data/pie/payment-data-pie.component';
-import { PatronPermissionsComponent } from './record/detail-view/patron-detail-view/patron-permissions/patron-permissions.component';
-import { PatronPermissionComponent } from './record/detail-view/patron-detail-view/patron-permissions/patron-permission/patron-permission.component';
-import { CirculationLogLoanComponent } from './record/circulation-logs/circulation-log/circulation-log-loan/circulation-log-loan.component';
-import { CirculationLogNotificationComponent } from './record/circulation-logs/circulation-log/circulation-log-notification/circulation-log-notification.component';
 
 /** Init application factory */
 export function appInitFactory(appInitializerService: AppInitializerService): () => Promise<any> {
@@ -271,7 +268,6 @@ export function appInitFactory(appInitializerService: AppInitializerService): ()
         RecordMaskedComponent,
         IdentifiedbyValueComponent,
         DialogImportComponent,
-        SubjectProcessPipe,
         NotificationTypePipe,
         CirculationLogsComponent,
         CirculationLogsDialogComponent,
@@ -370,8 +366,7 @@ export function appInitFactory(appInitializerService: AppInitializerService): ()
         // Use the "multi" parameter to allow the recovery of several services in the injector.
         { provide: typeaheadToken, useExisting: DocumentsTypeahead, multi: true },
         { provide: typeaheadToken, useExisting: ItemsTypeahead, multi: true },
-        { provide: typeaheadToken, useExisting: MefOrganisationTypeahead, multi: true },
-        { provide: typeaheadToken, useExisting: MefPersonTypeahead, multi: true },
+        { provide: typeaheadToken, useExisting: MefTypeahead, multi: true },
         { provide: typeaheadToken, useExisting: PatronsTypeahead, multi: true },
         {
             provide: CoreConfigService,
@@ -388,8 +383,7 @@ export function appInitFactory(appInitializerService: AppInitializerService): ()
         ItemsTypeahead,
         PatronsTypeahead,
         MainTitlePipe,
-        MefPersonTypeahead,
-        MefOrganisationTypeahead,
+        MefTypeahead,
         TruncateTextPipe,
         CurrentLibraryPermissionValidator,
         ReceivedOrderPermissionValidator,
diff --git a/projects/admin/src/app/circulation/item/item.component.html b/projects/admin/src/app/circulation/item/item.component.html
index cde35c228..a844b5abe 100644
--- a/projects/admin/src/app/circulation/item/item.component.html
+++ b/projects/admin/src/app/circulation/item/item.component.html
@@ -1,6 +1,6 @@
 <!--
   RERO ILS UI
-  Copyright (C) 2019 RERO
+  Copyright (C) 2019-2023 RERO
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
@@ -58,19 +58,7 @@
     <a [routerLink]="['/records','documents','detail', item.document.pid]" *ngIf="item.document.title | mainTitle as title ">
       {{ isCollapsed ? (title | truncateText: 12) : title }}
     </a>
-    <ng-container *ngIf="document && document.contribution && document.contribution.length > 0">
-      <ul class="list-inline mb-0 small">
-        <li *ngFor="let contribution of document.contribution; let last = last; let i = index" class="list-inline-item">
-          <span *ngIf="!contribution.agent.pid" [innerHTML]="contribution | contributionFormat: true"></span>
-          <a
-            *ngIf="contribution.agent.pid"
-            [innerHTML]="contribution | contributionFormat: true"
-            [routerLink]="['/records', 'persons', 'detail', contribution.agent.pid]">
-          </a>
-          {{ last ? '' : '; ' }}
-        </li>
-      </ul>
-    </ng-container>
+    <shared-contribution [contributions]="document?.contribution"></shared-contribution>
   </div>
   <!-- CIRCULATION INFO -->
   <div name="circ-info" class="col-2">
diff --git a/projects/admin/src/app/circulation/main-request/requested-item/requested-item.component.html b/projects/admin/src/app/circulation/main-request/requested-item/requested-item.component.html
index 434172f2c..be456b774 100644
--- a/projects/admin/src/app/circulation/main-request/requested-item/requested-item.component.html
+++ b/projects/admin/src/app/circulation/main-request/requested-item/requested-item.component.html
@@ -1,6 +1,6 @@
 <!--
  RERO ILS UI
-  Copyright (C) 2019 RERO
+  Copyright (C) 2019-2023 RERO
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
@@ -44,19 +44,7 @@
     <a [routerLink]="['/records','documents','detail', document.pid]" *ngIf="document.title | mainTitle as title ">
       {{ title }}
     </a><br/>
-    <ng-container *ngIf="document.contribution && document.contribution.length > 0">
-      <ul class="list-inline mb-0 small" *ngIf="document && document.contribution">
-        <li *ngFor="let contribution of document.contribution; let last = last; let i = index" class="list-inline-item">
-          <span *ngIf="!contribution.agent.pid" [innerHTML]="contribution | contributionFormat: true"></span>
-          <a
-            *ngIf="contribution.agent.pid"
-            [innerHTML]="contribution | contributionFormat: true"
-            [routerLink]="['/records', 'persons', 'detail', contribution.agent.pid]">
-          </a>
-          {{ last ? '' : '; ' }}
-        </li>
-      </ul>
-    </ng-container>
+    <shared-contribution [contributions]="document?.contribution"></shared-contribution>
   </div>
   <div name="call-number" class="col-2">
     <shared-inherited-call-number [item]="item"></shared-inherited-call-number>
diff --git a/projects/admin/src/app/circulation/patron/history/history-log/history-log.component.html b/projects/admin/src/app/circulation/patron/history/history-log/history-log.component.html
index 876c9ff00..e122b4f0d 100644
--- a/projects/admin/src/app/circulation/patron/history/history-log/history-log.component.html
+++ b/projects/admin/src/app/circulation/patron/history/history-log/history-log.component.html
@@ -32,25 +32,12 @@
       </ng-template>
     </div>
     <div class="col-sm-4">
-      <ng-container *ngIf="document && document.metadata.contribution; else noContributionRecord">
-        <ul class="list-inline mb-0">
-          <li class="list-inline-item mr-1" *ngFor="let contribution of document.metadata.contribution.slice(0,3) | contributionFilter:language; let last = last; let i = index">
-            <ng-container *ngIf="contribution.pid && contribution.target !== undefined; else agentNoLink">
-              <a [routerLink]="['/', 'records', contribution.type | contributionType, 'detail', contribution.pid]">
-                {{ contribution.authorizedAccessPoint }}
-              </a>
-            </ng-container>
-            <ng-template #agentNoLink>
-              {{ contribution.authorizedAccessPoint }}
-            </ng-template>
-            {{ last ? '' : '; ' }}
-            {{ last && i === 2 ? '; …' : '' }}
-          </li>
-        </ul>
-      </ng-container>
-      <ng-template #noContributionRecord>
-        &nbsp;
-      </ng-template>
+      <shared-contribution
+        *ngIf="document?.metadata?.contribution && document.metadata.contribution.length > 0; else noContributionRecord"
+        [contributions]="document.metadata.contribution"
+        [limitRecord]="3"
+      ></shared-contribution>
+      <ng-template #noContributionRecord>&nbsp;</ng-template>
     </div>
     <div class="col-sm-2">
       {{ log.metadata.date | dateTranslate: 'short' }}
diff --git a/projects/admin/src/app/circulation/patron/history/history-log/history-log.component.ts b/projects/admin/src/app/circulation/patron/history/history-log/history-log.component.ts
index 34e0b2527..c93109caf 100644
--- a/projects/admin/src/app/circulation/patron/history/history-log/history-log.component.ts
+++ b/projects/admin/src/app/circulation/patron/history/history-log/history-log.component.ts
@@ -1,6 +1,6 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2021 RERO
+ * Copyright (C) 2021-2023 RERO
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -16,7 +16,6 @@
  */
 
 import { Component, Input } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
 import { ProvisionActivityType } from '@rero/shared';
 import { OperationLogsApiService } from '@app/admin/api/operation-logs-api.service';
 
@@ -38,18 +37,11 @@ export class HistoryLogComponent {
   /** Checkout record operation logs */
   checkout: any = null;
 
-  /** Get current language */
-  get language(): string {
-    return this._translateService.currentLang;
-  }
-
   /**
    * Constructor
-   * @param _translateService - TranslateService
    * @param _operationLogsApiService - OperationLogsApiService
    */
   constructor(
-    private _translateService: TranslateService,
     private _operationLogsApiService: OperationLogsApiService
   ) {}
 
diff --git a/projects/admin/src/app/circulation/patron/pending/pending-item/pending-item.component.html b/projects/admin/src/app/circulation/patron/pending/pending-item/pending-item.component.html
index aa5c668e8..10df91bd7 100644
--- a/projects/admin/src/app/circulation/patron/pending/pending-item/pending-item.component.html
+++ b/projects/admin/src/app/circulation/patron/pending/pending-item/pending-item.component.html
@@ -1,6 +1,6 @@
 <!--
   RERO ILS UI
-  Copyright (C) 2020 RERO
+  Copyright (C) 2020-2023 RERO
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
@@ -29,19 +29,7 @@
     <a [routerLink]="['/records', 'documents', 'detail', document.pid]" *ngIf="document.title | mainTitle as title">
       {{ title }}
     </a><br/>
-    <ng-container *ngIf="document.contribution && document.contribution.length > 0">
-      <ul class="list-inline mb-0 small">
-        <li *ngFor="let contribution of document.contribution; let last = last; let i = index" class="list-inline-item">
-          <span *ngIf="!contribution.agent.pid" [innerHTML]="contribution | contributionFormat: true"></span>
-          <a
-            *ngIf="contribution.agent.pid"
-            [innerHTML]="contribution | contributionFormat: true"
-            [routerLink]="['/records', 'persons', 'detail', contribution.agent.pid]">
-          </a>
-          {{ last ? '' : '; ' }}
-        </li>
-      </ul>
-    </ng-container>
+    <shared-contribution [contributions]="document?.contribution"></shared-contribution>
   </div>
   <div class="col-2">{{ loan.created | dateTranslate: 'short' }}</div>
   <div class="col-2">-<!-- TODO :: display the computed expected_date --></div>
diff --git a/projects/admin/src/app/circulation/patron/pickup/pickup-item/pickup-item.component.html b/projects/admin/src/app/circulation/patron/pickup/pickup-item/pickup-item.component.html
index f52e33da4..ce0632466 100644
--- a/projects/admin/src/app/circulation/patron/pickup/pickup-item/pickup-item.component.html
+++ b/projects/admin/src/app/circulation/patron/pickup/pickup-item/pickup-item.component.html
@@ -1,6 +1,6 @@
 <!--
  RERO ILS UI
- Copyright (C) 2020 RERO
+ Copyright (C) 2020-2023 RERO
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as published by
@@ -22,19 +22,7 @@
     <a [routerLink]="['/records', 'documents', 'detail', document.pid]" *ngIf="document.title | mainTitle as title">
       {{ title }}
     </a><br/>
-    <ng-container *ngIf="document.contribution && document.contribution.length > 0">
-      <ul class="list-inline mb-0 small">
-        <li *ngFor="let contribution of document.contribution; let last = last; let i = index" class="list-inline-item">
-          <span *ngIf="!contribution.agent.pid" [innerHTML]="contribution | contributionFormat: true"></span>
-          <a
-            *ngIf="contribution.agent.pid"
-            [innerHTML]="contribution | contributionFormat: true"
-            [routerLink]="['/records', 'persons', 'detail', contribution.agent.pid]">
-          </a>
-          {{ last ? '' : '; ' }}
-        </li>
-      </ul>
-    </ng-container>
+    <shared-contribution [contributions]="document?.contribution"></shared-contribution>
   </div>
   <div class="col-3">
     {{ loan.metadata.pickup_location_pid | getRecord: 'locations' : 'field' : 'pickup_name' | async }}
diff --git a/projects/admin/src/app/classes/typeahead/ITypeahead-interface.ts b/projects/admin/src/app/classes/typeahead/ITypeahead-interface.ts
index d606c9808..df0e2fa4e 100644
--- a/projects/admin/src/app/classes/typeahead/ITypeahead-interface.ts
+++ b/projects/admin/src/app/classes/typeahead/ITypeahead-interface.ts
@@ -1,6 +1,6 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2020 RERO
+ * Copyright (C) 2020-2023 RERO
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -42,5 +42,5 @@ export interface ITypeahead {
    * @returns - an observable of the list of suggestions.
    */
   getSuggestions(options: any, query: string, numberOfSuggestions: number):
-    Observable<Array<SuggestionMetadata>>;
+  Observable<Array<SuggestionMetadata | string>>;
 }
diff --git a/projects/admin/src/app/classes/typeahead/documents-typeahead.ts b/projects/admin/src/app/classes/typeahead/documents-typeahead.ts
index bfe3fc89a..7388fd786 100644
--- a/projects/admin/src/app/classes/typeahead/documents-typeahead.ts
+++ b/projects/admin/src/app/classes/typeahead/documents-typeahead.ts
@@ -1,7 +1,7 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2020 RERO
- * Copyright (C) 2020 UCLouvain
+ * Copyright (C) 2020-2023 RERO
+ * Copyright (C) 2020-2023 UCLouvain
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -76,7 +76,7 @@ export class DocumentsTypeahead implements ITypeahead {
    * @param numberOfSuggestions - the max number of suggestion to return
    * @returns - an observable of the list of suggestions.
    */
-  getSuggestions(options: any, query: string, numberOfSuggestions: number): Observable<Array<SuggestionMetadata>> {
+  getSuggestions(options: any, query: string, numberOfSuggestions: number): Observable<Array<SuggestionMetadata | string>> {
     if (!query) {
       return of([]);
     }
@@ -124,7 +124,7 @@ export class DocumentsTypeahead implements ITypeahead {
 
     // Truncate text if the length of text great than maxLengthSuggestion
     if (text.length > this.maxLengthSuggestion) {
-      text = text.substr(0, this.maxLengthSuggestion) + '…';
+      text = text.slice(0, this.maxLengthSuggestion) + '…';
     }
 
     // Process identifiedBy
diff --git a/projects/admin/src/app/classes/typeahead/items-typeahead.ts b/projects/admin/src/app/classes/typeahead/items-typeahead.ts
index 2bfa50e27..02c1f397e 100644
--- a/projects/admin/src/app/classes/typeahead/items-typeahead.ts
+++ b/projects/admin/src/app/classes/typeahead/items-typeahead.ts
@@ -1,6 +1,6 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2020 RERO
+ * Copyright (C) 2020-2023 RERO
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -84,7 +84,7 @@ export class ItemsTypeahead implements ITypeahead {
    * @param value - formControl value i.e. $ref value
    * @returns Observable of string - html template representation of the value.
    */
-  getSuggestions(options: any, query: string, numberOfSuggestions: number): Observable<Array<SuggestionMetadata>> {
+  getSuggestions(options: any, query: string, numberOfSuggestions: number): Observable<Array<SuggestionMetadata | string>> {
     if (!query) {
       return of([]);
     }
diff --git a/projects/admin/src/app/classes/typeahead/mef-organisation-typeahead.ts b/projects/admin/src/app/classes/typeahead/mef-organisation-typeahead.ts
deleted file mode 100644
index 0f6ef6ef8..000000000
--- a/projects/admin/src/app/classes/typeahead/mef-organisation-typeahead.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2020 RERO
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { Injectable } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-import { RecordService } from '@rero/ng-core';
-import { AppSettingsService } from '@rero/shared';
-import { MefTypeahead } from './mef-typeahead';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class MefOrganisationTypeahead extends MefTypeahead {
-  constructor(
-    protected _recordService: RecordService,
-    protected _translateService: TranslateService,
-    protected _appSettingsService: AppSettingsService
-  ) {
-    super(
-      _recordService,
-      _translateService,
-      _appSettingsService
-    );
-    this.name = 'mef-organisations';
-    this.type = 'Organisation';
-  }
-}
diff --git a/projects/admin/src/app/classes/typeahead/mef-person-typeahead.ts b/projects/admin/src/app/classes/typeahead/mef-person-typeahead.ts
deleted file mode 100644
index 4f8c420aa..000000000
--- a/projects/admin/src/app/classes/typeahead/mef-person-typeahead.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2020 RERO
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { Injectable } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-import { RecordService } from '@rero/ng-core';
-import { AppSettingsService } from '@rero/shared';
-import { MefTypeahead } from './mef-typeahead';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class MefPersonTypeahead extends MefTypeahead {
-  constructor(
-    protected _recordService: RecordService,
-    protected _translateService: TranslateService,
-    protected _appSettingsService: AppSettingsService
-  ) {
-    super(
-      _recordService,
-      _translateService,
-      _appSettingsService
-    );
-    this.name = 'mef-persons';
-    this.type = 'Person';
-  }
-}
diff --git a/projects/admin/src/app/classes/typeahead/mef-typeahead.ts b/projects/admin/src/app/classes/typeahead/mef-typeahead.ts
index 40f905ba5..3fccc3af3 100644
--- a/projects/admin/src/app/classes/typeahead/mef-typeahead.ts
+++ b/projects/admin/src/app/classes/typeahead/mef-typeahead.ts
@@ -1,6 +1,6 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2020 RERO
+ * Copyright (C) 2020-2023 RERO
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -27,12 +27,6 @@ import { ITypeahead } from './ITypeahead-interface';
 })
 export class MefTypeahead implements ITypeahead {
 
-  /** Name of typeahead */
-  name = 'mef-persons';
-
-  /** Type of contribution */
-  type = 'Person';
-
   /** Entry point for MEF Api */
   apiMefEntryPoint = 'mef';
 
@@ -50,7 +44,7 @@ export class MefTypeahead implements ITypeahead {
 
   /** Get name of typeahead */
   getName() {
-    return this.name;
+    return 'mef';
   }
 
   /**
@@ -92,22 +86,25 @@ export class MefTypeahead implements ITypeahead {
    * @param numberOfSuggestions - the max number of suggestion to return
    * @returns - an observable of the list of suggestions.
    */
-  getSuggestions(options: any, query: string, numberOfSuggestions: number): Observable<Array<SuggestionMetadata>> {
+  getSuggestions(options: any, query: string, numberOfSuggestions: number): Observable<Array<SuggestionMetadata | string>> {
     if (!query) {
       return of([]);
     }
 
-    const sources = this._appSettingsService.contributionSources
+    if (null == options?.filters?.selected) {
+      throw Error('Missing filters definition');
+    }
+
+    const sources = this._appSettingsService.agentSources
       .filter((source: string) => source !== 'rero');
 
     const contributionQuery = [
       `((autocomplete_name:${query})^2 OR ${query})`,
       `AND sources:(${sources.join(' OR ')})`,
-      `AND type:bf\\:${this.type}`
+      `AND type:${options.filters.selected.replace(':', '\\:')}`
     ].join(' ');
 
-    return this._recordService
-      .getRecords(
+    return this._recordService.getRecords(
         this.apiMefEntryPoint,
         contributionQuery,
         1,
@@ -165,12 +162,12 @@ export class MefTypeahead implements ITypeahead {
    */
   private _sources(): string[] {
     const language = this._translateService.currentLang;
-    const order: any = this._appSettingsService.contributionsLabelOrder;
+    const order: any = this._appSettingsService.agentLabelOrder;
     const key = language in order ? language : 'fallback';
-    const contributionSources = (key === 'fallback')
+    const agentSources = (key === 'fallback')
       ? order[order[key]]
       : order[key];
-    const sources = contributionSources.filter((source: string) => source !== 'rero');
+    const sources = agentSources.filter((source: string) => source !== 'rero');
     return sources;
   }
 }
diff --git a/projects/admin/src/app/classes/typeahead/patrons-typeahead.ts b/projects/admin/src/app/classes/typeahead/patrons-typeahead.ts
index 232c31d52..327f89cd8 100644
--- a/projects/admin/src/app/classes/typeahead/patrons-typeahead.ts
+++ b/projects/admin/src/app/classes/typeahead/patrons-typeahead.ts
@@ -1,7 +1,7 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2020 RERO
- * Copyright (C) 2020 UCLouvain
+ * Copyright (C) 2020-2023 RERO
+ * Copyright (C) 2020-2023 UCLouvain
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { ApiService, RecordService, SuggestionMetadata } from '@rero/ng-core';
-import { of, Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { PatronService } from '../../service/patron.service';
 import { ITypeahead } from './ITypeahead-interface';
@@ -76,7 +76,7 @@ export class PatronsTypeahead implements ITypeahead {
    * @param numberOfSuggestions - the max number of suggestion to return
    * @returns - an observable of the list of suggestions.
    */
-  getSuggestions(options: any, query: string, numberOfSuggestions: number): Observable<Array<SuggestionMetadata>> {
+  getSuggestions(options: any, query: string, numberOfSuggestions: number): Observable<Array<SuggestionMetadata | string>> {
     if (!query) {
       return of([]);
     }
diff --git a/projects/admin/src/app/pipe/subject-process.pipe.spec.ts b/projects/admin/src/app/pipe/subject-process.pipe.spec.ts
deleted file mode 100644
index f8043ef70..000000000
--- a/projects/admin/src/app/pipe/subject-process.pipe.spec.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2021 RERO
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { AppSettingsService, SharedModule } from '@rero/shared';
-import { SubjectProcessPipe } from './subject-process.pipe';
-
-describe('SubjectProcessPipe', () => {
-  const input = [
-    {
-      $schema: 'https://bib.rero.ch/schemas/contributions/contribution-v0.0.1.json',
-      type: 'bf:Person',
-      gnd: {
-        preferred_name: 'gnd preferred name'
-      },
-      idref: {
-        preferred_name: 'idref preferred name'
-      },
-      rero: {
-        preferred_name: 'rero preferred name'
-      }
-    },
-    {
-      term: 'subject vocabulary',
-      type: 'bf:Topic'
-    },
-    {
-      preferred_name: 'author',
-      type: 'bf:Person'
-    },
-    {
-      title: 'Le dragon du Muveran',
-      creator: 'Voltenauer, Marc',
-      type: 'bf:Work'
-    }
-  ];
-  const outputFr = [
-    { type: 'bf:Person', text: 'idref preferred name' },
-    { type: 'bf:Topic', text: 'subject vocabulary' },
-    { type: 'bf:Person', text: 'author' },
-    { type: 'bf:Work', text: 'Le dragon du Muveran / Voltenauer, Marc' }
-  ];
-  const outputDe = [
-    { type: 'bf:Person', text: 'gnd preferred name' },
-    { type: 'bf:Topic', text: 'subject vocabulary' },
-    { type: 'bf:Person', text: 'author' },
-    { type: 'bf:Work', text: 'Le dragon du Muveran / Voltenauer, Marc' }
-  ];
-
-  let pipe: SubjectProcessPipe;
-  let appSettings: AppSettingsService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        SharedModule,
-        TranslateModule.forRoot(),
-        HttpClientTestingModule
-      ],
-      providers: [
-        SubjectProcessPipe
-      ]
-    });
-    pipe = TestBed.inject(SubjectProcessPipe);
-    appSettings = TestBed.inject(AppSettingsService);
-    appSettings.settings = {
-      baseUrl: 'https://bib.rero.ch',
-      contributionSources: [],
-      contributionAgentTypes: '',
-      contributionsLabelOrder: {
-        fallback: 'fr',
-        fr: ['idref', 'rero', 'gnd'],
-        de: ['gnd', 'idref', 'rero']
-      },
-      globalView: 'global',
-      language: 'fr',
-      operationLogs: [],
-      userProfile: {
-        readOnly: false,
-        readOnlyFields: []
-      }
-    };
-  });
-
-  it('create an instance', () => {
-    expect(pipe).toBeTruthy();
-  });
-
-  it('should return an array with the value (french)', () => {
-    expect(pipe.transform(input, 'fr')).toEqual(outputFr);
-  });
-
-  it('should return an array with the value (Deutsch)', () => {
-    expect(pipe.transform(input, 'de')).toEqual(outputDe);
-  });
-
-  it('should return an array with the value (English => Fallback)', () => {
-    expect(pipe.transform(input, 'en')).toEqual(outputFr);
-  });
-});
diff --git a/projects/admin/src/app/pipe/subject-process.pipe.ts b/projects/admin/src/app/pipe/subject-process.pipe.ts
deleted file mode 100644
index d757ed8ae..000000000
--- a/projects/admin/src/app/pipe/subject-process.pipe.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2021 RERO
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import { Pipe, PipeTransform } from '@angular/core';
-import { AppSettingsService } from '@rero/shared';
-
-@Pipe({
-  name: 'subjectProcess'
-})
-export class SubjectProcessPipe implements PipeTransform {
-
-  /**
-   * Constructor
-   * @param _appSettingsService - AppSettingsService
-   */
-  constructor(private _appSettingsService: AppSettingsService) {}
-
-  /**
-   * Transform
-   * @param subjects - subjects of record
-   * @param language - current language
-   * @return array of type and text
-   */
-  transform(subjects: any, language: string = 'en'): { type: string, text: string}[] {
-    const orders = this._appSettingsService.contributionsLabelOrder;
-    const output = [];
-    subjects.forEach((subject: any) => {
-      const data = {
-        type: subject.type,
-        text: null
-      };
-      if ('$schema' in subject) {
-        let source = null;
-        if (!(Object.keys(orders).some(order => order === language))) {
-          language = orders.fallback;
-        }
-        orders[language].every((s: string) => {
-          if (s in subject) {
-            source = subject[s];
-            return false;
-          }
-          return true;
-        });
-        data.text = source.preferred_name;
-      }
-      if ('term' in subject) {
-        data.text = subject.term;
-      } else {
-        if ('preferred_name' in subject) {
-          data.text = subject.preferred_name;
-        } else {
-          if ('title' in subject) {
-            let text = subject.title;
-            if ('creator' in subject) {
-              text += ' / ' + subject.creator;
-            }
-            data.text = text;
-          }
-        }
-      }
-      output.push(data);
-    });
-    return output;
-  }
-
-}
diff --git a/projects/admin/src/app/record/brief-view/documents-brief-view/documents-brief-view.component.html b/projects/admin/src/app/record/brief-view/documents-brief-view/documents-brief-view.component.html
index 7ff2c1eb6..fabfb3ba4 100644
--- a/projects/admin/src/app/record/brief-view/documents-brief-view/documents-brief-view.component.html
+++ b/projects/admin/src/app/record/brief-view/documents-brief-view/documents-brief-view.component.html
@@ -1,6 +1,6 @@
  <!--
   RERO ILS UI
-  Copyright (C) 2019 RERO
+  Copyright (C) 2019-2023 RERO
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
@@ -29,20 +29,7 @@ <h5 class="mb-0 card-title">
     </h5>
     <ng-container class="card-text">
       <!-- contribution -->
-      <ul class="list-inline mb-0" *ngIf="record.metadata.contribution && record.metadata.contribution.length > 0">
-        <li
-          class="list-inline-item"
-          *ngFor="let contribution of record.metadata.contribution.slice(0,3); let last = last; let i = index">
-          <span *ngIf="!contribution.agent.pid">
-            {{ contribution | contributionFormat }}
-          </span>
-          <a *ngIf="contribution.agent.pid" [routerLink]="['/records', contributionTypeParam(contribution.agent), 'detail', contribution.agent.pid]">
-            {{ contribution | contributionFormat }}
-          </a>
-          {{ last ? '' : '; ' }}
-          {{ last && record.metadata.contribution.length > 3 ? '; …' : '' }}
-        </li>
-      </ul>
+      <shared-contribution [contributions]="record.metadata?.contribution" [limitRecord]="3"></shared-contribution>
       <!-- provision activity publications -->
       <ul class="list-unstyled" *ngIf="provisionActivityPublications.length > 0">
         <li *ngFor="let publication of provisionActivityPublications">{{ publication.value }}</li>
diff --git a/projects/admin/src/app/record/detail-view/collection-detail-view/collection-items/collection-items.component.html b/projects/admin/src/app/record/detail-view/collection-detail-view/collection-items/collection-items.component.html
index a33968def..a3563ea08 100644
--- a/projects/admin/src/app/record/detail-view/collection-detail-view/collection-items/collection-items.component.html
+++ b/projects/admin/src/app/record/detail-view/collection-detail-view/collection-items/collection-items.component.html
@@ -1,6 +1,6 @@
 <!--
   RERO ILS UI
-  Copyright (C) 2020 RERO
+  Copyright (C) 2020-2023 RERO
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
@@ -28,22 +28,7 @@ <h5>
             </a>
           </h5>
           <div class="my-2">
-            <div *ngIf="document.metadata.contribution && document.metadata.contribution.length > 0">
-              <span class="font-weight-bold" translate>Contribution</span>:
-              <ng-container
-                class="list-inline-item"
-                *ngFor="let contribution of document.metadata.contribution; let last = last; let i = index"
-              >
-                <span *ngIf="!contribution.agent.pid" [innerHTML]="contribution | contributionFormat: true"></span>
-                <a
-                  *ngIf="contribution.agent.pid"
-                  [innerHTML]="contribution | contributionFormat: true"
-                  [routerLink]="['/records', contribution.agent.type | contributionType, 'detail', contribution.agent.pid]"
-                >
-                </a>
-                {{ last ? '' : '; ' }}
-              </ng-container>
-            </div>
+            <shared-contribution [contributions]="document.metadata?.contribution"></shared-contribution>
             <div>
               <span class="font-weight-bold" translate>Publication</span>:
               {{ document.metadata.provisionActivity[0]._text[0].value }}
diff --git a/projects/admin/src/app/record/detail-view/contribution-detail-view/contribution-detail-view.component.ts b/projects/admin/src/app/record/detail-view/contribution-detail-view/contribution-detail-view.component.ts
index e57363914..8ee971e87 100644
--- a/projects/admin/src/app/record/detail-view/contribution-detail-view/contribution-detail-view.component.ts
+++ b/projects/admin/src/app/record/detail-view/contribution-detail-view/contribution-detail-view.component.ts
@@ -53,7 +53,7 @@ export class ContributionDetailViewComponent implements DetailRecord, OnInit {
     this.documents$ = this.record$.pipe(
       switchMap((record: any) => {
         const contributionPid = record.metadata.pid;
-        const query = `contribution.agent.pid:${contributionPid}`;
+        const query = `contribution.entity.pid:${contributionPid}`;
         return this._recordService.getRecords(
         'documents', query, 1, RecordService.MAX_REST_RESULTS_SIZE
       ); }),
diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.ts b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.ts
index fb119acbf..8ae6c831f 100644
--- a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.ts
+++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.ts
@@ -180,8 +180,8 @@ export class DocumentDescriptionComponent {
     if ('work_access_point' in this.record.metadata) {
       this.record.metadata.work_access_point.forEach((workAccess: any) => {
         let agentFormatted = '';
-        if (workAccess.agent) {
-          const agent = workAccess.agent;
+        if (workAccess.creator) {
+          const agent = workAccess.creator;
           if ('bf:Person' === agent.type) {
             // Person
             const name = [];
diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.html b/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.html
index e087d9f52..b07bad4b7 100644
--- a/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.html
+++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.html
@@ -37,10 +37,7 @@
         <ul class="list-unstyled">
           <li class="figure-caption" *ngFor="let genre of record.metadata.genreForm">
             <i class="fa fa-tag mr-1"></i>
-            <ng-container *ngIf="genre.term; else genreFormLink">{{ genre.term }}</ng-container>
-            <ng-template #genreFormLink>
-              <!-- TODO: GENRE FORM LINK (not implemend with typeahead) -->
-            </ng-template>
+            {{ genre.entity.authorized_access_point }}
           </li>
         </ul>
       </ng-container>
@@ -75,22 +72,7 @@ <h3 id="{{ 'doc-altgr-title-' + i }}">{{ altgr_title }}</h3>
       </ng-container>
 
       <!-- CONTRIBUTION -->
-      <ng-container *ngIf="record.metadata.contribution && record.metadata.contribution.length > 0">
-        <ul class="list-inline mb-0">
-          <li
-            class="list-inline-item"
-            *ngFor="let contribution of record.metadata.contribution; last as isLast; let i = index"
-            [attr.id]="i | idAttribute:{prefix: 'doc-contribution'}"
-          >
-            <span *ngIf="!contribution.agent.pid" [innerHTML]="contribution | contributionFormat: true"></span>
-            <a
-            *ngIf="contribution.agent.pid"
-            [innerHTML]="contribution | contributionFormat: true"
-            [routerLink]="['/records', contributionTypeParam(contribution.agent), 'detail', contribution.agent.pid]">
-            </a><ng-container *ngIf="!isLast">; </ng-container>
-          </li>
-        </ul>
-      </ng-container>
+      <shared-contribution [contributions]="record.metadata?.contribution" [withRoles]="true"></shared-contribution>
 
       <!-- PUBLICATION ACTIVITY: PUBLICATION -->
       <ng-container *ngVar="record.metadata.provisionActivity | documentProvisionActivity | keyvalue | callbackArrayFilter: filterPublicationProvisionActivity as provisionActivity">
@@ -200,8 +182,8 @@ <h3 id="{{ 'doc-altgr-title-' + i }}">{{ altgr_title }}</h3>
         <div class="col">
           <span *ngFor="let subject of subjects"
             class="badge badge-secondary mr-1"
-            title="{{ subject.type | translate }}">
-            <i class="fa fa-tag"></i> {{ subject._text }}
+            title="{{ subject.entity.type | translate }}">
+            <i class="fa fa-tag"></i> {{ subject.entity.authorized_access_point }}
           </span>
         </div>
       </div>
diff --git a/projects/admin/src/app/routes/corporate-bodies-route.ts b/projects/admin/src/app/routes/corporate-bodies-route.ts
index 5791e4e1b..eb3484a25 100644
--- a/projects/admin/src/app/routes/corporate-bodies-route.ts
+++ b/projects/admin/src/app/routes/corporate-bodies-route.ts
@@ -59,7 +59,7 @@ export class CorporateBodiesRoute extends BaseRoute implements RouteInterface {
         types: [
           {
             key: 'corporate-bodies',
-            index: 'contributions',
+            index: 'entities',
             label: _('Organisation'),
             component: ContributionBriefComponent,
             detailComponent: ContributionDetailViewComponent,
diff --git a/projects/admin/src/app/routes/import-documents-route.ts b/projects/admin/src/app/routes/import-documents-route.ts
index 164faecb0..0eeac30c0 100644
--- a/projects/admin/src/app/routes/import-documents-route.ts
+++ b/projects/admin/src/app/routes/import-documents-route.ts
@@ -21,7 +21,6 @@ import { PERMISSIONS, PERMISSION_OPERATOR } from '@rero/shared';
 import { Observable, of } from 'rxjs';
 import { ImportSourceApiService } from '../api/import-source-api.service';
 import { ExternalSourceSetting } from '../classes/external-source';
-import { CanAccessGuard, CAN_ACCESS_ACTIONS } from '../guard/can-access.guard';
 import { PermissionGuard } from '../guard/permission.guard';
 import { DocumentsBriefViewComponent } from '../record/brief-view/documents-brief-view/documents-brief-view.component';
 import { DocumentDetailViewComponent } from '../record/detail-view/document-detail-view/document-detail-view.component';
diff --git a/projects/admin/src/app/routes/persons-route.ts b/projects/admin/src/app/routes/persons-route.ts
index 5566005b2..1941f8bc9 100644
--- a/projects/admin/src/app/routes/persons-route.ts
+++ b/projects/admin/src/app/routes/persons-route.ts
@@ -59,7 +59,7 @@ export class PersonsRoute extends BaseRoute implements RouteInterface {
         types: [
           {
             key: 'persons',
-            index: 'contributions',
+            index: 'entities',
             label: _('Persons'),
             component: ContributionBriefComponent,
             detailComponent: ContributionDetailViewComponent,
diff --git a/projects/admin/src/app/service/ui-remote-typeahead.service.spec.ts b/projects/admin/src/app/service/ui-remote-typeahead.service.spec.ts
index f37e82521..bf4c825cc 100644
--- a/projects/admin/src/app/service/ui-remote-typeahead.service.spec.ts
+++ b/projects/admin/src/app/service/ui-remote-typeahead.service.spec.ts
@@ -1,6 +1,6 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2020 RERO
+ * Copyright (C) 2020-2023 RERO
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -22,8 +22,7 @@ import { RecordModule, TruncateTextPipe } from '@rero/ng-core';
 import { MainTitlePipe, SharedModule } from '@rero/shared';
 import { DocumentsTypeahead } from '../classes/typeahead/documents-typeahead';
 import { ItemsTypeahead } from '../classes/typeahead/items-typeahead';
-import { MefOrganisationTypeahead } from '../classes/typeahead/mef-organisation-typeahead';
-import { MefPersonTypeahead } from '../classes/typeahead/mef-person-typeahead';
+import { MefTypeahead } from '../classes/typeahead/mef-typeahead';
 import { PatronsTypeahead } from '../classes/typeahead/patrons-typeahead';
 import { UiRemoteTypeaheadService } from './ui-remote-typeahead.service';
 
@@ -40,8 +39,7 @@ describe('UiRemoteTypeaheadService', () => {
     providers: [
       DocumentsTypeahead,
       ItemsTypeahead,
-      MefPersonTypeahead,
-      MefOrganisationTypeahead,
+      MefTypeahead,
       PatronsTypeahead,
       TruncateTextPipe,
       MainTitlePipe
diff --git a/projects/public-search/src/app/document-brief/document-brief.component.html b/projects/public-search/src/app/document-brief/document-brief.component.html
index ca0412589..5b0e5279c 100644
--- a/projects/public-search/src/app/document-brief/document-brief.component.html
+++ b/projects/public-search/src/app/document-brief/document-brief.component.html
@@ -1,6 +1,6 @@
 <!--
   RERO ILS UI
-  Copyright (C) 2019 RERO
+  Copyright (C) 2019-2023 RERO
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
@@ -23,22 +23,7 @@ <h4 class="mb-1">
       <a target="_self" [href]="detailUrl.link | safeUrl">{{ record.metadata.title | mainTitle }}</a>
     </h4>
     <!-- contributions -->
-    <ul class="list-inline mb-0" *ngIf="record.metadata.contribution && record.metadata.contribution.length > 0">
-      <li *ngFor="let contribution of record.metadata.contribution.slice(0,3); let last = last; let i = index"
-          class="list-inline-item">
-        <ng-container *ngIf="!contribution.agent.pid; else contribLink">
-          {{ contribution | contributionFormat }}
-        </ng-container>
-        <ng-template #contribLink>
-          <a *ngIf="contribution.agent.pid"
-             href="/{{ viewcode }}/{{ contribution.agent.type | contributionType }}/{{ contribution.agent.pid }}">
-            {{ contribution | contributionFormat }}
-          </a>
-        </ng-template>
-        {{ last ? '' : '; ' }}
-        {{ last && record.metadata.contribution.length > 3 ? '; …' : '' }}
-      </li>
-    </ul>
+    <shared-contribution [contributions]="record.metadata?.contribution" [view]="viewcode"></shared-contribution>
     <!-- provision activity publications -->
     <ul class="list-unstyled" *ngIf="provisionActivityPublications.length > 0">
       <li *ngFor="let publication of provisionActivityPublications">{{ publication.value }}</li>
diff --git a/projects/public-search/src/app/patron-profile/patron-profile-document/patron-profile-document.component.html b/projects/public-search/src/app/patron-profile/patron-profile-document/patron-profile-document.component.html
index 70faf0bb1..ecd5f3c88 100644
--- a/projects/public-search/src/app/patron-profile/patron-profile-document/patron-profile-document.component.html
+++ b/projects/public-search/src/app/patron-profile/patron-profile-document/patron-profile-document.component.html
@@ -1,6 +1,6 @@
 <!--
   RERO ILS UI
-  Copyright (C) 2021 RERO
+  Copyright (C) 2021-2023 RERO
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
@@ -18,18 +18,7 @@
 <a href="/{{ viewcode }}/documents/{{ record.metadata.document.pid }}" class="d-block">
   {{ record.metadata.document.title | mainTitle }}
 </a>
-<ng-container *ngIf="document && document.contribution && document.contribution.length > 0">
-  <ul class="list-inline mb-0 small">
-    <li *ngFor="let contribution of document.contribution; let last = last; let i = index" class="list-inline-item">
-      <span *ngIf="!contribution.agent.pid" [innerHTML]="contribution | contributionFormat: true"></span>
-      <a *ngIf="contribution.agent.pid"
-        href="/{{ viewcode }}/{{ getContributorLinkType(contribution.agent.type) }}/{{ contribution.agent.pid }}"
-        [innerHTML]="contribution | contributionFormat">
-      </a>
-      <ng-container *ngIf="!last">; </ng-container>
-    </li>
-  </ul>
-</ng-container>
+<shared-contribution [contributions]="document?.contribution" [view]="viewcode"></shared-contribution>
 <div class="container mt-2 pl-0" *ngIf="record.metadata" [collapse]="!showAdditionalInformation" [isAnimated]="isAnimated">
   <dl class="row">
     <!-- CALL NUMBER -->
diff --git a/projects/public-search/src/app/patron-profile/patron-profile-document/patron-profile-document.component.ts b/projects/public-search/src/app/patron-profile/patron-profile-document/patron-profile-document.component.ts
index 50801c4be..66221fb77 100644
--- a/projects/public-search/src/app/patron-profile/patron-profile-document/patron-profile-document.component.ts
+++ b/projects/public-search/src/app/patron-profile/patron-profile-document/patron-profile-document.component.ts
@@ -1,6 +1,6 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2021 RERO
+ * Copyright (C) 2021-2023 RERO
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -40,10 +40,6 @@ export class PatronProfileDocumentComponent implements OnInit {
   get viewcode(): string {
     return this._patronProfileMenuService.currentPatron.organisation.code;
   }
-  /** Get current language */
-  get language(): string {
-    return this._translateService.currentLang;
-  }
 
   /** Get the formatted call numbers for the related item */
   get callNumbers(): string {
@@ -53,19 +49,6 @@ export class PatronProfileDocumentComponent implements OnInit {
     ).filter(Boolean).join(' | ');
   }
 
-  /**
-   * Translate contribution type to parameter
-   * @param type - contribution type
-   * @returns string, contribution parameter
-   */
-  getContributorLinkType(type: string): string {
-    switch (type) {
-      case 'bf:Person': return 'persons';
-      case 'bf:Organisation': return 'corporate-bodies';
-      default: return type;
-    }
-  }
-
   // CONSTRUCTOR & HOOKS ======================================================
   /**
    * Constructor
diff --git a/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.html b/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.html
index 3ecc6fd59..8eeed3939 100644
--- a/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.html
+++ b/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.html
@@ -15,7 +15,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<div class="container p-2">
+<div class="container p-2" *ngIf="record">
   <div class="row">
     <!-- DOCUMENT & ADDITIONAL DATA ===================================== -->
     <div *ngVar="record.metadata.loan.item.document.pid | getRecord:'documents':'object':'':{ Accept:'application/rero+json' } | async as document"
@@ -24,19 +24,7 @@
         {{ record.metadata.loan.item.document.title }}
       </a>
       <ng-template #nodocument>{{ record.metadata.loan.item.document.title }}</ng-template>
-      <ul class="list-inline mb-0 small" *ngIf="document">
-        <li class="list-inline-item mr-1" *ngFor="let contribution of document.metadata.contribution | contributionFilter:language; let last = last">
-          <ng-container *ngIf="contribution.pid && contribution.target !== undefined; else agentNoLink">
-            <a href="/{{ viewcode }}/{{ contribution.target }}/{{ contribution.pid }}">
-              {{ contribution.authorizedAccessPoint }}
-            </a>
-          </ng-container>
-          <ng-template #agentNoLink>
-            {{ contribution.authorizedAccessPoint }}
-          </ng-template>
-          <ng-container *ngIf="!last">; </ng-container>
-        </li>
-      </ul>
+      <shared-contribution *ngIf="document" [contributions]="document.metadata?.contribution" [view]="viewcode"></shared-contribution>
     </div>
     <!-- DUE DATE  ====================================================== -->
     <div class="col-sm-12 col-lg-2">
diff --git a/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.spec.ts b/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.spec.ts
index c7b513486..20770e732 100644
--- a/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.spec.ts
+++ b/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.spec.ts
@@ -19,7 +19,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { CoreModule, RecordModule } from '@rero/ng-core';
-import { ContributionFilterPipe, SharedModule, testUserPatronWithSettings, UserApiService, UserService } from '@rero/shared';
+import { SharedModule, testUserPatronWithSettings, UserApiService, UserService } from '@rero/shared';
 import { cloneDeep } from 'lodash-es';
 import { of } from 'rxjs';
 import { PatronProfileMenuService } from '../../patron-profile-menu.service';
@@ -53,7 +53,6 @@ describe('PatronProfileHistoryComponent', () => {
     TestBed.configureTestingModule({
       declarations: [
         PatronProfileHistoryComponent,
-        ContributionFilterPipe
       ],
       imports: [
         HttpClientTestingModule,
diff --git a/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.ts b/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.ts
index 1ed013e1b..588fa976b 100644
--- a/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.ts
+++ b/projects/public-search/src/app/patron-profile/patron-profile-histories/patron-profile-history/patron-profile-history.component.ts
@@ -1,6 +1,6 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2021 RERO
+ * Copyright (C) 2021-2023 RERO
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { Component, Input } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
 import { PatronProfileMenuService } from '../../patron-profile-menu.service';
 
 @Component({
@@ -36,18 +35,11 @@ export class PatronProfileHistoryComponent {
     return this._patronProfileMenuService.currentPatron.organisation.code;
   }
 
-  /** Get current language */
-  get language(): string {
-    return this._translateService.currentLang;
-  }
-
   /**
    * Constructor
-   * @param _translateService - TranslateService
    * @param _patronProfileMenuService - PatronProfileMenuService
    */
   constructor(
-    private _translateService: TranslateService,
     private _patronProfileMenuService: PatronProfileMenuService
   ) {}
 }
diff --git a/projects/public-search/src/app/routes/documents-route.service.ts b/projects/public-search/src/app/routes/documents-route.service.ts
index c8dacaadd..2b088aedc 100644
--- a/projects/public-search/src/app/routes/documents-route.service.ts
+++ b/projects/public-search/src/app/routes/documents-route.service.ts
@@ -176,7 +176,7 @@ export class DocumentsRouteService extends BaseRoute implements ResourceRouteInt
             },
             {
               key: 'persons',
-              index: 'contributions',
+              index: 'entities',
               component: ContributionBriefComponent,
               label: _('Persons'),
               aggregationsOrder: ['sources'],
@@ -193,7 +193,7 @@ export class DocumentsRouteService extends BaseRoute implements ResourceRouteInt
             },
             {
               key: 'corporate-bodies',
-              index: 'contributions',
+              index: 'entities',
               component: ContributionBriefComponent,
               label: _('Corporate bodies'),
               aggregationsOrder: ['sources'],
diff --git a/projects/shared/src/lib/pipe/contribution-entity.pipe.spec.ts b/projects/shared/src/lib/pipe/contribution-entity.pipe.spec.ts
new file mode 100644
index 000000000..e4cae0a77
--- /dev/null
+++ b/projects/shared/src/lib/pipe/contribution-entity.pipe.spec.ts
@@ -0,0 +1,155 @@
+/*
+ * RERO ILS UI
+ * Copyright (C) 2023 RERO
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import { TestBed } from '@angular/core/testing';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { AppSettingsService } from '../service/app-settings.service';
+import { ContributionEntityPipe, EntityInterface } from './contribution-entity.pipe';
+import { cloneDeep } from 'lodash-es';
+
+describe('ContributionEntityPipe', () => {
+
+  let contributionEntityPipe: ContributionEntityPipe;
+  let translateService: TranslateService;
+
+  const appSettingsServiceSpy = jasmine.createSpyObj('AppSettingsService', ['']);
+  appSettingsServiceSpy.settings = {
+    'agentAgentTypes': {
+      'bf:Person': 'persons',
+      'bf:Organisation': 'corporate-bodies'
+    }
+  };
+
+  const contributions = [
+    {
+      entity: {
+        authorized_access_point_de: 'Schweizerischer Fischereiverein',
+        authorized_access_point_en: 'Swiss Fishing Federation',
+        authorized_access_point_fr: 'Fédération suisse de pêche',
+        authorized_access_point_it: 'Federazione svizzera della pesca',
+        id_gnd: '1086038177',
+        id_idref: '184282624',
+        id_rero: 'A000153245',
+        pid: '4360604',
+        primary_source: 'idref',
+        type: 'bf:Organisation'
+      },
+      role: ['ctb']
+    },
+    {
+      entity: {
+        authorized_access_point: 'Casas Ros, Antoni, 1972-',
+        authorized_access_point_de: 'Casas Ros, Antoni, 1972-',
+        authorized_access_point_en: 'Casas Ros, Antoni, 1972-',
+        authorized_access_point_fr: 'Casas Ros, Antoni, 1972-',
+        authorized_access_point_it: 'Casas Ros, Antoni, 1972-',
+        type: 'bf:Person'
+      },
+      role: ['cre']
+    }
+  ];
+
+  const contributions_result_en: EntityInterface = {
+    count: 2,
+    entries: [
+      {
+        authorizedAccessPoint: 'Swiss Fishing Federation',
+        pid: '4360604',
+        type: 'bf:Organisation',
+        roles: ['contributor'],
+        target: 'corporate-bodies'
+      },
+      {
+        authorizedAccessPoint: 'Casas Ros, Antoni, 1972-',
+        pid: undefined,
+        type: 'bf:Person',
+        roles: ['creator'],
+        target: 'persons'
+      }
+    ]
+  };
+
+  const contributions_result_fr: EntityInterface = {
+    count: 2,
+    entries: [
+      {
+        authorizedAccessPoint: 'Fédération suisse de pêche',
+        pid: '4360604',
+        type: 'bf:Organisation',
+        roles: ['contributeur'],
+        target: 'corporate-bodies'
+      },
+      {
+        authorizedAccessPoint: 'Casas Ros, Antoni, 1972-',
+        pid: undefined,
+        type: 'bf:Person',
+        roles: ['créateur'],
+        target: 'persons'
+      }
+    ]
+  };
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot()
+      ],
+      providers: [
+        ContributionEntityPipe,
+        TranslateService,
+        { provide: AppSettingsService, useValue: appSettingsServiceSpy }
+      ]
+    });
+    contributionEntityPipe = TestBed.inject(ContributionEntityPipe);
+    translateService = TestBed.inject(TranslateService);
+    translateService.setTranslation('fr', {
+      'cre': 'créateur',
+      'ctb': 'contributeur'
+    });
+    translateService.setTranslation('en', {
+      'cre': 'creator',
+      'ctb': 'contributor'
+    });
+  });
+
+  it('create an instance', () => {
+    expect(contributionEntityPipe).toBeTruthy();
+  });
+
+  it('Should return 2 converted records (french)', () => {
+    translateService.use('fr');
+    expect(contributionEntityPipe.transform(contributions)).toEqual(contributions_result_fr);
+  });
+
+  it('Should return 2 converted records (english)', () => {
+    translateService.use('en');
+    expect(contributionEntityPipe.transform(contributions)).toEqual(contributions_result_en);
+  });
+
+  it('Should return 1 record converted with the Person filter (english)', () => {
+    translateService.use('en');
+    const result = cloneDeep(contributions_result_en);
+    result.entries.splice(0, 1);
+    expect(contributionEntityPipe.transform(contributions, ['bf:Person'])).toEqual(result);
+  });
+
+  it('Should return 1 record converted with the limit parameter (english)', () => {
+    translateService.use('en');
+    const result = cloneDeep(contributions_result_en);
+    result.entries.splice(1, 1);
+    expect(contributionEntityPipe.transform(contributions, ['bf:Person', 'bf:Organisation'], 1)).toEqual(result);
+  });
+});
diff --git a/projects/shared/src/lib/pipe/contribution-entity.pipe.ts b/projects/shared/src/lib/pipe/contribution-entity.pipe.ts
new file mode 100644
index 000000000..24d889c87
--- /dev/null
+++ b/projects/shared/src/lib/pipe/contribution-entity.pipe.ts
@@ -0,0 +1,92 @@
+/*
+ * RERO ILS UI
+ * Copyright (C) 2023 RERO
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import { Pipe, PipeTransform } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { AppSettingsService } from '../service/app-settings.service';
+
+@Pipe({
+  name: 'contributionEntity'
+})
+export class ContributionEntityPipe implements PipeTransform {
+
+  private _authorizedKey = 'authorized_access_point';
+  /**
+   * Constructor
+   * @param _appSettingsService - AppSettingsService
+   * @param _translateService - TranslateService
+   */
+    constructor(
+      private _appSettingsService: AppSettingsService,
+      private _translateService: TranslateService
+    ) {}
+
+  transform(
+    contributions: any[],
+    filters: string[] = ['bf:Person', 'bf:Organisation'],
+    limit?: number
+  ): EntityInterface {
+    const result = { count: contributions.length, entries: []};
+    contributions.filter(c => filters.includes(c.entity.type)).map(contrib => {
+      const newContrib = {
+        authorizedAccessPoint: this._authorizedAccessPoint(contrib.entity),
+        pid: contrib.entity?.pid,
+        type: contrib.entity.type,
+        roles: [],
+        target: this._target(contrib.entity.type),
+      };
+      if (contrib.role != null) {
+        newContrib.roles = contrib.role.map(
+          (r: string) => this._translateService.instant(r));
+      }
+      result.entries.push(newContrib);
+    });
+    if (limit) {
+      result.entries = result.entries.slice(0, limit);
+    }
+
+    return result;
+  }
+
+  private _authorizedAccessPoint(entity: any): string {
+    if (entity.pid) {
+      // Mef
+      const key = `${this._authorizedKey}_${this._translateService.currentLang}`;
+      const fallbackKey = `${this._authorizedKey}_en`;
+      return (key in entity) ? entity[key] : entity[fallbackKey];
+    } else {
+      // Local
+      return entity[this._authorizedKey]
+    }
+  }
+
+  private _target(type: string): string | undefined {
+    const entityTypes = this._appSettingsService.settings.agentAgentTypes || {};
+
+    return (type in entityTypes) ? entityTypes[type] : undefined;
+  }
+}
+
+export interface EntityInterface {
+  count: number,
+  entries: {
+    authorizedAccessPoint: string;
+    pid: string | undefined;
+    type: string;
+    roles: string[];
+    target: string | undefined;
+  }[]
+}
diff --git a/projects/shared/src/lib/pipe/contribution-filter.pipe.spec.ts b/projects/shared/src/lib/pipe/contribution-filter.pipe.spec.ts
deleted file mode 100644
index 04b29dfa6..000000000
--- a/projects/shared/src/lib/pipe/contribution-filter.pipe.spec.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2021-2023 RERO
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import { ContributionFilterPipe } from './contribution-filter.pipe';
-
-describe('ContributionFilterPipe', () => {
-  const pipe = new ContributionFilterPipe();
-
-  const contributions = [
-    {
-      agent: {
-        pid: 1,
-        type: 'bf:Person',
-        authorized_access_point_en: 'contribution EN',
-        authorized_access_point_fr: 'contribution FR'
-      },
-      role: 'author'
-    },
-    {
-      agent: {
-        preferred_name: 'Müller, Hans',
-        type: 'bf:Person'
-      },
-      role: 'author'
-    }
-  ];
-
-  const contributionsResultsEn = [
-    {
-      authorizedAccessPoint: 'contribution EN',
-      pid: 1,
-      type: 'bf:Person',
-      role: 'author',
-      target: 'persons'
-    },
-    {
-      authorizedAccessPoint: 'Müller, Hans',
-      pid: undefined,
-      type: 'bf:Person',
-      role: 'author',
-      target: 'persons'
-    }
-  ];
-
-  const contributionsResultsFr = [
-    {
-      authorizedAccessPoint: 'contribution FR',
-      pid: 1,
-      type: 'bf:Person',
-      role: 'author',
-      target: 'persons'
-    },
-    {
-      authorizedAccessPoint: 'Müller, Hans',
-      pid: undefined,
-      type: 'bf:Person',
-      role: 'author',
-      target: 'persons'
-    }
-  ];
-
-  it('create an instance', () => {
-    expect(pipe).toBeTruthy();
-  });
-
-  it('should extract the right contributor (default language)', () => {
-    expect(pipe.transform(contributions)).toEqual(contributionsResultsEn);
-  });
-
-  it('should extract the right contributor (language: french)', () => {
-    expect(pipe.transform(contributions, 'fr')).toEqual(contributionsResultsFr);
-  });
-
-  it('should extract the right contributor in english if language does not exists', () => {
-    expect(pipe.transform(contributions, 'de')).toEqual(contributionsResultsEn);
-  });
-});
diff --git a/projects/shared/src/lib/pipe/contribution-filter.pipe.ts b/projects/shared/src/lib/pipe/contribution-filter.pipe.ts
deleted file mode 100644
index 782370a72..000000000
--- a/projects/shared/src/lib/pipe/contribution-filter.pipe.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2021-2023 RERO
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import { Pipe, PipeTransform } from '@angular/core';
-
-@Pipe({
-  name: 'contributionFilter'
-})
-export class ContributionFilterPipe implements PipeTransform {
-
-  /**
-   * Transform agent to extract access point for current language
-   * @param contributions - array of contributions (agent)
-   * @param language - current language interface
-   * @return array of contributions
-   */
-  transform(contributions: any[], language: string = 'en'): any[] {
-    const output = [];
-    const key = `authorized_access_point_${language}`;
-    if (contributions) {
-      contributions.forEach(contribution => {
-        const agent = contribution.agent;
-        const accessPoint = !('pid' in agent)
-          ? agent.preferred_name
-          : (key in agent)
-            ? agent[key]
-            : agent.authorized_access_point_en;
-        output.push({
-          authorizedAccessPoint: accessPoint,
-          pid: ('pid' in agent) ? agent.pid : undefined,
-          type: agent.type,
-          role: contribution.role,
-          target: this._linkTarget(agent.type)
-        });
-      });
-    }
-    return output;
-  }
-
-  /**
-   * Link Target
-   * @param type - type of agent
-   * @return target name
-   */
-  private _linkTarget(type: string): string {
-    switch (type) {
-      case 'bf:Person':
-        return 'persons';
-      case 'bf:Organisation':
-        return 'corporate-bodies';
-      default:
-        return undefined;
-    }
-  }
-
-}
diff --git a/projects/shared/src/lib/pipe/contribution-format.pipe.spec.ts b/projects/shared/src/lib/pipe/contribution-format.pipe.spec.ts
deleted file mode 100644
index 88637de19..000000000
--- a/projects/shared/src/lib/pipe/contribution-format.pipe.spec.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2020 RERO
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { ContributionFormatPipe } from './contribution-format.pipe';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { TestBed } from '@angular/core/testing';
-
-const contributionPerson = {
-  agent: {
-    authorized_access_point_en: 'Köhler, Peter Thomas (en)',
-    authorized_access_point_fr: 'Köhler, Peter T (fr)',
-    pid: '12809924',
-    type: 'bf:Person'
-  },
-  role: [
-    'cre'
-  ]
-};
-
-const contributionMultipleRolesPerson = {
-  agent: {
-    authorized_access_point_en: 'Köhler, Peter Thomas (en)',
-    authorized_access_point_fr: 'Köhler, Peter T (fr)',
-    pid: '12809924',
-    type: 'bf:Person'
-  },
-  role: [
-    'cre',
-    'con'
-  ]
-};
-
-const contributionPreferredPerson = {
-  agent: {
-    authorized_access_point_en: 'Köhler, Peter Thomas (en)',
-    authorized_access_point_fr: 'Köhler, Peter T (fr)',
-    preferred_name: 'Köhler, Peter T',
-    type: 'bf:Person'
-  },
-  role: [
-    'cre'
-  ]
-};
-
-const contributionOrganisation = {
-  agent: {
-    authorized_access_point_en: 'Vita et Pax Foundation (en)',
-    authorized_access_point_fr: 'Vita et Pax Foundation (fr)',
-    type: 'bf:Organisation'
-  },
-  role: [
-    'ctb'
-  ]
-};
-
-const contributionPreferredOrganisation = {
-  agent: {
-    preferred_name: 'Vita et Pax Foundation',
-    type: 'bf:Organisation'
-  },
-  role: [
-    'ctb'
-  ]
-};
-
-describe('Pipe: ContributionFormate', () => {
-
-  let contributionFormatPipe: ContributionFormatPipe;
-
-  let translateService: TranslateService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot()
-      ],
-      providers: [
-        ContributionFormatPipe,
-        TranslateService
-      ]
-    });
-    contributionFormatPipe = TestBed.inject(ContributionFormatPipe);
-    translateService = TestBed.inject(TranslateService);
-  });
-
-  it('create an instance', () => {
-    expect(contributionFormatPipe).toBeTruthy();
-  });
-
-  /* ----- Person ----- */
-  it('Pipe return the default value EN for person agent', () => {
-    translateService.currentLang = 'en';
-    expect(contributionFormatPipe.transform(contributionPerson))
-    .toBe('Köhler, Peter Thomas (en)');
-  });
-
-  it('Pipe return the default value FR for person agent', () => {
-    translateService.currentLang = 'fr';
-    expect(contributionFormatPipe.transform(contributionPerson))
-    .toBe('Köhler, Peter T (fr)');
-  });
-
-  it('Pipe return the fallback value FR for person agent', () => {
-    translateService.currentLang = 'de';
-    expect(contributionFormatPipe.transform(contributionPerson))
-    .toBe('Köhler, Peter T (fr)');
-  });
-
-  it('Pipe return the value EN with role for person agent', () => {
-    translateService.currentLang = 'en';
-    expect(contributionFormatPipe.transform(contributionPerson, true))
-    .toBe('Köhler, Peter Thomas (en) <span class="text-secondary">(cre)<span>');
-  });
-
-  it('Pipe return the value EN with roles for person agent', () => {
-    translateService.currentLang = 'en';
-    expect(contributionFormatPipe.transform(contributionMultipleRolesPerson, true))
-    .toBe('Köhler, Peter Thomas (en) <span class="text-secondary">(cre, con)<span>');
-  });
-
-  it('Pipe return the value EN with fallback EN for person agent', () => {
-    translateService.currentLang = 'en';
-    expect(contributionFormatPipe.transform(contributionPerson, false, 'en'))
-    .toBe('Köhler, Peter Thomas (en)');
-  });
-
-  it('Pipe return the preferred value for person agent', () => {
-    translateService.currentLang = 'en';
-    expect(contributionFormatPipe.transform(contributionPreferredPerson))
-    .toBe('Köhler, Peter Thomas (en)');
-  });
-
-
-  /* ----- Organisation ----- */
-  it('Pipe return the default value EN for organisation agent', () => {
-    translateService.currentLang = 'en';
-    expect(contributionFormatPipe.transform(contributionOrganisation))
-    .toBe('Vita et Pax Foundation (en)');
-  });
-
-  it('Pipe return the default value FR for organisation agent', () => {
-    translateService.currentLang = 'fr';
-    expect(contributionFormatPipe.transform(contributionOrganisation))
-    .toBe('Vita et Pax Foundation (fr)');
-  });
-
-  it('Pipe return the default value FR for organisation agent', () => {
-    translateService.currentLang = 'de';
-    expect(contributionFormatPipe.transform(contributionOrganisation))
-    .toBe('Vita et Pax Foundation (fr)');
-  });
-
-  it('Pipe return the fallback value EN for organisation agent', () => {
-    translateService.currentLang = 'de';
-    expect(contributionFormatPipe.transform(contributionOrganisation, false, 'en'))
-    .toBe('Vita et Pax Foundation (en)');
-  });
-
-  it('Pipe return the preferred value for organisation agent', () => {
-    translateService.currentLang = 'en';
-    expect(contributionFormatPipe.transform(contributionPreferredOrganisation))
-    .toBe('Vita et Pax Foundation');
-  });
-});
diff --git a/projects/shared/src/lib/pipe/contribution-format.pipe.ts b/projects/shared/src/lib/pipe/contribution-format.pipe.ts
deleted file mode 100644
index 3ad2fb1f3..000000000
--- a/projects/shared/src/lib/pipe/contribution-format.pipe.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * RERO ILS UI
- * Copyright (C) 2020 RERO
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import { Pipe, PipeTransform } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-
-@Pipe({
-  name: 'contributionFormat',
-  pure: false
-})
-export class ContributionFormatPipe implements PipeTransform {
-
-  /** field name prefix for access point */
-  private accessPoint = 'authorized_access_point';
-
-  /**
-   * Constructor
-   * @param translate - TranslateService
-   */
-  constructor(private _translate: TranslateService) {}
-
-  /**
-   * @param contribution - Object
-   * @param withRole - Flag to add role(s) after agent
-   * @param fallbackLanguage - default language if the value isn't found
-   * @return string
-   */
-  transform(contribution: any, withRole = false, fallbackLanguage = 'fr'): any {
-    let agent = null;
-    if (contribution.agent) {
-      agent = this._transformAgent(contribution.agent, fallbackLanguage);
-      if ('role' in contribution && withRole) {
-        agent += ' ' + this._transformRole(contribution.role);
-      }
-    }
-    return agent;
-  }
-
-  /**
-   * Transform Person
-   * @param agent - Agent
-   * @param fallbackLanguage - Default language
-   * @return string
-   */
-  private _transformAgent(agent: any, fallbackLanguage = null) {
-    let result = null;
-    const agentIndexName = `${this.accessPoint}_${this._translate.currentLang}`;
-    const agentfallback = `${this.accessPoint}_${fallbackLanguage}`;
-    if (agentIndexName in agent) {
-      result = agent[agentIndexName];
-    } else if (agentfallback in agent) {
-      result = agent[agentfallback];
-    } else if ('preferred_name' in agent) {
-      result = agent.preferred_name;
-    }
-    return result;
-  }
-
-  /**
-   * Transform Role
-   * @param agentRole - Agent role(s)
-   * @return string
-   */
-  private _transformRole(agentRole: any) {
-    const roles = [];
-    agentRole.map((role: string) => {
-      roles.push(this._translate.instant(role));
-    });
-    if (roles.length > 0) {
-      return `<span class="text-secondary">(${roles.join(', ')})<span>`;
-    }
-    return null;
-  }
-}
diff --git a/projects/shared/src/lib/pipe/contribution-type.pipe.ts b/projects/shared/src/lib/pipe/contribution-type.pipe.ts
index e8f88f8d3..f94386544 100644
--- a/projects/shared/src/lib/pipe/contribution-type.pipe.ts
+++ b/projects/shared/src/lib/pipe/contribution-type.pipe.ts
@@ -36,7 +36,7 @@ export class ContributionTypePipe implements PipeTransform {
    * @throws Error on missing type
    */
   transform(type: string): any {
-    const configType = this._appSettingsService.contributionAgentTypes[type];
+    const configType = this._appSettingsService.agentAgentTypes[type];
     if (configType) {
       return configType;
     }
diff --git a/projects/shared/src/lib/pipe/extract-source-field.pipe.ts b/projects/shared/src/lib/pipe/extract-source-field.pipe.ts
index 34521fcd4..a42eed2d9 100644
--- a/projects/shared/src/lib/pipe/extract-source-field.pipe.ts
+++ b/projects/shared/src/lib/pipe/extract-source-field.pipe.ts
@@ -42,12 +42,12 @@ export class ExtractSourceFieldPipe implements PipeTransform {
    * @return string or null
    */
   transform(metadata: any, field: string): string | null {
-    const contributionsLabel: any = this._appSettingsService.contributionsLabelOrder;
+    const contributionsLabel: any = this._appSettingsService.agentLabelOrder;
     const language = this._translateService.currentLang;
-    const contributionsLabelOrder = (language in contributionsLabel)
+    const agentLabelOrder = (language in contributionsLabel)
       ? contributionsLabel[language]
       : contributionsLabel[contributionsLabel.fallback];
-    for (const source of contributionsLabelOrder) {
+    for (const source of agentLabelOrder) {
       if (
         metadata.hasOwnProperty(source)
         && metadata[source].hasOwnProperty(field)
diff --git a/projects/shared/src/lib/pipe/url-active.pipe.ts b/projects/shared/src/lib/pipe/url-active.pipe.ts
index af95237ce..2c6b6834f 100644
--- a/projects/shared/src/lib/pipe/url-active.pipe.ts
+++ b/projects/shared/src/lib/pipe/url-active.pipe.ts
@@ -23,13 +23,13 @@ import { Pipe, PipeTransform } from '@angular/core';
 export class UrlActivePipe implements PipeTransform {
 
   transform(text: string, target: string = '_self'): any {
-    let output = '';
+    let output = text;
     const re = new RegExp(/(https?:\/\/[\w|.|\-|\/]+)/, 'gm');
     let match: RegExpExecArray;
     // tslint:disable-next-line: no-conditional-assignment
     while ((match = re.exec(text)) !== null) {
       const url = match[0];
-      output += text.replace(url, `<a href="${url}" target="${target}">${url}</a>`);
+      output = output.replace(url, `<a href="${url}" target="${target}">${url}</a>`);
     }
     return output;
   }
diff --git a/projects/shared/src/lib/service/app-settings.service.spec.ts b/projects/shared/src/lib/service/app-settings.service.spec.ts
index a89e68646..7e23db040 100644
--- a/projects/shared/src/lib/service/app-settings.service.spec.ts
+++ b/projects/shared/src/lib/service/app-settings.service.spec.ts
@@ -50,17 +50,17 @@ describe('ApplicationSettingsService', () => {
 
   it('should return the parameter contribution sources', () => {
     service.settings = settings;
-    expect(service.contributionSources).toEqual(settings.contributionSources);
+    expect(service.agentSources).toEqual(settings.agentSources);
   });
 
   it('should return the parameter contributions agent types', () => {
     service.settings = settings;
-    expect(service.contributionAgentTypes).toEqual(settings.contributionAgentTypes);
+    expect(service.agentAgentTypes).toEqual(settings.agentAgentTypes);
   });
 
   it('should return the parameter contributions label order', () => {
     service.settings = settings;
-    expect(service.contributionsLabelOrder).toEqual(settings.contributionsLabelOrder);
+    expect(service.agentLabelOrder).toEqual(settings.agentLabelOrder);
   });
 
   it('should return the parameter global view', () => {
diff --git a/projects/shared/src/lib/service/app-settings.service.ts b/projects/shared/src/lib/service/app-settings.service.ts
index 803f2faa7..6633124d4 100644
--- a/projects/shared/src/lib/service/app-settings.service.ts
+++ b/projects/shared/src/lib/service/app-settings.service.ts
@@ -71,27 +71,27 @@ export class AppSettingsService {
    * Get contribution sources
    * @return array of string
    */
-  get contributionSources(): string[] {
+  get agentSources(): string[] {
     this._checkSettings();
-    return this._settings.contributionSources;
+    return this._settings.agentSources;
   }
 
   /**
    * Get contribution agent types
    * @return any
    */
-  get contributionAgentTypes(): any {
+  get agentAgentTypes(): any {
     this._checkSettings();
-    return this._settings.contributionAgentTypes;
+    return this._settings.agentAgentTypes;
   }
 
   /**
    * Get contribution order
    * @return array of order with fallback
    */
-  get contributionsLabelOrder(): any {
+  get agentLabelOrder(): any {
     this._checkSettings();
-    return this._settings.contributionsLabelOrder;
+    return this._settings.agentLabelOrder;
   }
 
   /**
@@ -135,9 +135,9 @@ export class AppSettingsService {
 /** Interface for settings */
 export interface ISettings {
   baseUrl: string;
-  contributionSources: string[];
-  contributionAgentTypes: any;
-  contributionsLabelOrder: any;
+  agentSources: string[];
+  agentAgentTypes: any;
+  agentLabelOrder: any;
   globalView: string;
   language: string;
   operationLogs: any;
diff --git a/projects/shared/src/lib/service/search-bar-config.service.ts b/projects/shared/src/lib/service/search-bar-config.service.ts
index aa70f69b5..371b7df27 100644
--- a/projects/shared/src/lib/service/search-bar-config.service.ts
+++ b/projects/shared/src/lib/service/search-bar-config.service.ts
@@ -76,7 +76,7 @@ export class SearchBarConfigService {
     this._maxLengthSuggestion = maxLengthSuggestion;
 
     // If you add a new type, please specify it in the "shared-config.service.ts"
-    // file on contributionAgentTypes attribute
+    // file on agentAgentTypes attribute
     return [
       {
         type: 'documents',
@@ -87,7 +87,7 @@ export class SearchBarConfigService {
       },
       {
         type: 'persons',
-        index: 'contributions',
+        index: 'entities',
         field: 'autocomplete_name',
         maxNumberOfSuggestions: 5,
         getSuggestions: (query: any, persons: any) => this._getPersonsSuggestions(query, persons),
@@ -96,7 +96,7 @@ export class SearchBarConfigService {
       },
       {
         type: 'organisations',
-        index: 'contributions',
+        index: 'entities',
         field: 'autocomplete_name',
         maxNumberOfSuggestions: 5,
         getSuggestions: (query: any, organisations: any) => this._getOrganisationsSuggestions(query, organisations),
@@ -187,7 +187,7 @@ export class SearchBarConfigService {
       values.push({
         text: this._highlightSearch(text, query),
         query: '',
-        index: 'contributions',
+        index: 'entities',
         category,
         href: this._generateContributionLink(urlIndex, hit.metadata.pid),
         iconCssClass: `fa fa-${icon}`
@@ -239,13 +239,13 @@ export class SearchBarConfigService {
    */
   private _getContributionName(metadata: any): string {
     const language = this._translateService.currentLang;
-    const order: any = this._appSettingsService.contributionsLabelOrder;
+    const order: any = this._appSettingsService.agentLabelOrder;
     const key = (language in order) ? language : 'fallback';
-    const contributionSources = (key === 'fallback')
+    const agentSources = (key === 'fallback')
       ? order[order[key]]
       : order[key];
 
-    for (const source of contributionSources) {
+    for (const source of agentSources) {
       if (metadata[source] && metadata[source].authorized_access_point) {
         return metadata[source].authorized_access_point;
       }
diff --git a/projects/shared/src/lib/shared.module.ts b/projects/shared/src/lib/shared.module.ts
index 4ea4455ac..790b7cb94 100644
--- a/projects/shared/src/lib/shared.module.ts
+++ b/projects/shared/src/lib/shared.module.ts
@@ -1,6 +1,6 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2020 RERO
+ * Copyright (C) 2020-2023 RERO
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -22,11 +22,14 @@ import { CoreModule, NgVarDirective, Nl2brPipe, RecordModule, TruncateTextPipe }
 import { PopoverModule } from 'ngx-bootstrap/popover';
 import { TooltipModule } from 'ngx-bootstrap/tooltip';
 import { ActionButtonComponent } from './component/action-button/action-button.component';
+import { LinkPermissionsDirective } from './directive/link-permissions.directive';
+import { PermissionsDirective } from './directive/permissions.directive';
 import { PrimeNgImportModule } from './modules/prime-ng-import/prime-ng-import.module';
 import { ShowMorePagerComponent } from './paginator/show-more-pager/show-more-pager.component';
-import { ContributionFormatPipe } from './pipe/contribution-format.pipe';
+import { ContributionEntityPipe } from './pipe/contribution-entity.pipe';
 import { ContributionTypePipe } from './pipe/contribution-type.pipe';
 import { ExtractSourceFieldPipe } from './pipe/extract-source-field.pipe';
+import { GetTranslatedLabelPipe } from './pipe/get-translated-label.pipe';
 import { IdAttributePipe } from './pipe/id-attribute.pipe';
 import { ItemHoldingsCallNumberPipe } from './pipe/item-holdings-call-number.pipe';
 import { JoinPipe } from './pipe/join.pipe';
@@ -43,12 +46,9 @@ import { ContributionSourcesComponent } from './view/brief/contribution-sources/
 import { OrganisationBriefComponent } from './view/brief/organisation-brief/organisation-brief.component';
 import { PartOfComponent } from './view/brief/part-of/part-of.component';
 import { PersonBriefComponent } from './view/brief/person-brief/person-brief.component';
+import { ContributionComponent } from './view/contribution/contribution.component';
 import { InheritedCallNumberComponent } from './view/inherited-call-number/inherited-call-number.component';
 import { ThumbnailComponent } from './view/thumbnail/thumbnail.component';
-import { GetTranslatedLabelPipe } from './pipe/get-translated-label.pipe';
-import { ContributionFilterPipe } from './pipe/contribution-filter.pipe';
-import { PermissionsDirective } from './directive/permissions.directive';
-import { LinkPermissionsDirective } from './directive/link-permissions.directive';
 
 @NgModule({
     declarations: [
@@ -56,7 +56,6 @@ import { LinkPermissionsDirective } from './directive/link-permissions.directive
         ContributionSourcesComponent,
         OrganisationBriefComponent,
         PersonBriefComponent,
-        ContributionFormatPipe,
         ExtractSourceFieldPipe,
         IdAttributePipe,
         JoinPipe,
@@ -72,12 +71,13 @@ import { LinkPermissionsDirective } from './directive/link-permissions.directive
         ShowMorePagerComponent,
         KeyExistsPipe,
         GetTranslatedLabelPipe,
-        ContributionFilterPipe,
         ActionButtonComponent,
         NotesFilterPipe,
         SafeUrlPipe,
         PermissionsDirective,
-        LinkPermissionsDirective
+        LinkPermissionsDirective,
+        ContributionEntityPipe,
+        ContributionComponent,
     ],
     exports: [
         CommonModule,
@@ -86,7 +86,6 @@ import { LinkPermissionsDirective } from './directive/link-permissions.directive
         ContributionSourcesComponent,
         OrganisationBriefComponent,
         PersonBriefComponent,
-        ContributionFormatPipe,
         ExtractSourceFieldPipe,
         IdAttributePipe,
         JoinPipe,
@@ -103,12 +102,13 @@ import { LinkPermissionsDirective } from './directive/link-permissions.directive
         ShowMorePagerComponent,
         KeyExistsPipe,
         GetTranslatedLabelPipe,
-        ContributionFilterPipe,
         ActionButtonComponent,
         NotesFilterPipe,
         SafeUrlPipe,
         PermissionsDirective,
-        LinkPermissionsDirective
+        LinkPermissionsDirective,
+        ContributionEntityPipe,
+        ContributionComponent
     ],
     imports: [
         CommonModule,
@@ -129,7 +129,8 @@ import { LinkPermissionsDirective } from './directive/link-permissions.directive
         Nl2brPipe,
         NgVarDirective,
         KeyExistsPipe,
-        NotesFilterPipe
+        NotesFilterPipe,
+        ContributionEntityPipe
     ],
     schemas: [
         NO_ERRORS_SCHEMA
diff --git a/projects/shared/src/lib/view/brief/organisation-brief/organisation-brief.component.ts b/projects/shared/src/lib/view/brief/organisation-brief/organisation-brief.component.ts
index 70e09852a..fe3305e5c 100644
--- a/projects/shared/src/lib/view/brief/organisation-brief/organisation-brief.component.ts
+++ b/projects/shared/src/lib/view/brief/organisation-brief/organisation-brief.component.ts
@@ -44,7 +44,7 @@ export class OrganisationBriefComponent implements ResultItem {
    */
   contributionType(detailUrlLink: string) {
     return detailUrlLink.replace(
-      'contributions',
+      'entities',
       this._contributionTypePipe.transform(this.record.metadata.type)
     );
   }
diff --git a/projects/shared/src/lib/view/brief/person-brief/person-brief.component.ts b/projects/shared/src/lib/view/brief/person-brief/person-brief.component.ts
index 64589761e..017bef2ad 100644
--- a/projects/shared/src/lib/view/brief/person-brief/person-brief.component.ts
+++ b/projects/shared/src/lib/view/brief/person-brief/person-brief.component.ts
@@ -47,7 +47,7 @@ export class PersonBriefComponent implements ResultItem {
    */
   contributionType(detailUrlLink: string) {
     return detailUrlLink.replace(
-      'contributions',
+      'entities',
       this._contributionTypePipe.transform(this.record.metadata.type)
     );
   }
diff --git a/projects/shared/src/lib/view/contribution/contribution.component.html b/projects/shared/src/lib/view/contribution/contribution.component.html
new file mode 100644
index 000000000..9864a7d58
--- /dev/null
+++ b/projects/shared/src/lib/view/contribution/contribution.component.html
@@ -0,0 +1,44 @@
+<!--
+  RERO ILS UI
+  Copyright (C) 2023 RERO
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, version 3 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<ng-container *ngIf="contributions">
+  <ul class="list-inline mb-0" *ngVar="contributions|contributionEntity:filters:limitRecord as data">
+    <li
+      class="list-inline-item"
+      *ngFor="let entity of data.entries; last as isLast"
+    >
+      <ng-container *ngIf="entity.pid && entity.target; else entityNoLink">
+        <!-- public view-->
+        <a *ngIf="view; else professional" href="{{ view }}/{{ entity.target }}/{{ entity.pid }}">
+          {{ entity.authorizedAccessPoint }}
+        </a>
+        <ng-template #professional>
+          <a class="mr-1" [routerLink]="['/records', entity.target, 'detail', entity.pid]">
+            {{ entity.authorizedAccessPoint }}
+          </a>
+        </ng-template>
+      </ng-container>
+      <ng-template #entityNoLink>
+        {{ entity.authorizedAccessPoint }}
+      </ng-template>
+      <ng-container *ngIf="withRoles && entity.roles.length > 0">
+        <span class="text-secondary">({{ entity.roles | join:', ' }})</span>
+      </ng-container>
+      <ng-container *ngIf="!isLast">;</ng-container>
+      <ng-container *ngIf="isLast && limitRecord && data.count > limitRecord">; …</ng-container>
+    </li>
+  </ul>
+</ng-container>
diff --git a/projects/shared/src/lib/view/contribution/contribution.component.ts b/projects/shared/src/lib/view/contribution/contribution.component.ts
new file mode 100644
index 000000000..0b6df5a46
--- /dev/null
+++ b/projects/shared/src/lib/view/contribution/contribution.component.ts
@@ -0,0 +1,37 @@
+/*
+ * RERO ILS UI
+ * Copyright (C) 2019-2023 RERO
+ * Copyright (C) 2019-2023 UCLouvain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'shared-contribution',
+  templateUrl: './contribution.component.html'
+})
+export class ContributionComponent {
+
+  // COMPONENT ATTRIBUTES =====================================================
+  /** List of contributor */
+  @Input() contributions: Array<{entity: any, role: Array<string>}> = [];
+  /** List of contributor types to display */
+  @Input() filters: string[] = ['bf:Person', 'bf:Organisation']
+  /** The number of contributors to display */
+  @Input() limitRecord: number | undefined;
+  /** Is the role of contributor should be displayed */
+  @Input() withRoles: boolean = false;
+  /** The view where component is displayed (viewcode | 'professional') */
+  @Input() view: string | undefined;
+}
diff --git a/projects/shared/src/public-api.ts b/projects/shared/src/public-api.ts
index 166a6eb5d..8371ab669 100644
--- a/projects/shared/src/public-api.ts
+++ b/projects/shared/src/public-api.ts
@@ -1,6 +1,6 @@
 /*
  * RERO ILS UI
- * Copyright (C) 2020-2022 RERO
+ * Copyright (C) 2020-2023 RERO
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -21,19 +21,17 @@
 
 export * from './lib/api/base-api';
 export * from './lib/api/user-api.service';
-export * from './lib/modules/prime-ng-import/prime-ng-import.module';
 export * from './lib/class/core';
 export * from './lib/class/holdings';
 export * from './lib/class/item-status';
 export * from './lib/class/user';
 export * from './lib/component/action-button/action-button.component';
-export * from './lib/modules/prime-ng-import/prime-ng-import.module';
 export * from './lib/directive/link-permissions.directive';
 export * from './lib/directive/permissions.directive';
+export * from './lib/modules/prime-ng-import/prime-ng-import.module';
 export * from './lib/paginator/paginator';
 export * from './lib/paginator/show-more-pager/show-more-pager.component';
-export * from './lib/pipe/contribution-filter.pipe';
-export * from './lib/pipe/contribution-format.pipe';
+export * from './lib/pipe/contribution-entity.pipe';
 export * from './lib/pipe/contribution-type.pipe';
 export * from './lib/pipe/extract-source-field.pipe';
 export * from './lib/pipe/get-translated-label.pipe';
@@ -58,7 +56,7 @@ export * from './lib/view/brief/contribution-sources/contribution-sources.compon
 export * from './lib/view/brief/organisation-brief/organisation-brief.component';
 export * from './lib/view/brief/part-of/part-of.component';
 export * from './lib/view/brief/person-brief/person-brief.component';
+export * from './lib/view/contribution/contribution.component';
 export * from './lib/view/inherited-call-number/inherited-call-number.component';
 export * from './lib/view/thumbnail/thumbnail.component';
 export * from './tests/user';
-
diff --git a/projects/shared/src/tests/user.ts b/projects/shared/src/tests/user.ts
index 08c97adec..e7b0c4ac7 100644
--- a/projects/shared/src/tests/user.ts
+++ b/projects/shared/src/tests/user.ts
@@ -152,16 +152,16 @@ export const testUserPatronWithSettings = {
   ],
   settings: {
     baseUrl: 'https://bib.rero.ch',
-    contributionSources: [
+    agentSources: [
       'idref',
       'gnd',
       'rero'
     ],
-    contributionAgentTypes: {
+    agentAgentTypes: {
       'bf:Person': 'persons',
       'bf:Organisation': 'corporate-bodies'
     },
-    contributionsLabelOrder: {
+    agentLabelOrder: {
       de: [
         'gnd',
         'idref',
@@ -365,16 +365,16 @@ export const testUserPatronMultipleOrganisationsWithSettings = {
   ],
   settings: {
     baseUrl: 'https://bib.rero.ch',
-    contributionSources: [
+    agentSources: [
       'idref',
       'gnd',
       'rero'
     ],
-    contributionAgentTypes: {
+    agentAgentTypes: {
       'bf:Person': 'persons',
       'bf:Organisation': 'corporate-bodies'
     },
-    contributionsLabelOrder: {
+    agentLabelOrder: {
       de: [
         'gnd',
         'idref',
@@ -457,16 +457,16 @@ export const testUserLibrarianWithSettings = {
   ],
   settings: {
     baseUrl: 'https://bib.rero.ch',
-    contributionSources: [
+    agentSources: [
       'idref',
       'gnd',
       'rero'
     ],
-    contributionAgentTypes: {
+    agentAgentTypes: {
       'bf:Person': 'persons',
       'bf:Organisation': 'corporate-bodies'
     },
-    contributionsLabelOrder: {
+    agentLabelOrder: {
       de: [
         'gnd',
         'idref',