diff --git a/CHANGELOG.md b/CHANGELOG.md
index df2a3f1b28..d97e69027d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [v1.22.1](https://github.com/rero/rero-ils/tree/v1.22.1) (2024-06-06)
+
+**Fixes:**
+* fix(editor): resolve contribution and subject required subfields [\#3696](https://github.com/rero/rero-ils/pull/3696) (by @Garfield-fr)
+
 ## [v1.22.0](https://github.com/rero/rero-ils/tree/v1.22.0) (2024-05-16)
 
 [Full Changelog](https://github.com/rero/rero-ils/compare/v1.21.0...v1.22.0)
diff --git a/pyproject.toml b/pyproject.toml
index 5442b984ca..54a15b3755 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rero-ils"
-version = "1.22.0"
+version = "1.22.1"
 description = "Invenio digital library framework."
 authors = ["RERO <software@rero.ch>"]
 license = "GNU Affero General Public License v3.0"
diff --git a/rero_ils/translations/ar/LC_MESSAGES/messages.po b/rero_ils/translations/ar/LC_MESSAGES/messages.po
index 5b2d1c6870..6461ad3217 100644
--- a/rero_ils/translations/ar/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/ar/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.9.1\n"
 "Report-Msgid-Bugs-To: software@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2021-10-24 13:38+0000\n"
 "Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
 "Language: ar\n"
@@ -6373,16 +6373,39 @@ msgid ""
 "contributing role for the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
 " (including conferences)."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6413,13 +6436,6 @@ msgstr ""
 msgid "Agent (textual)"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7693,13 +7709,8 @@ msgstr "ملاحظة عامة"
 msgid "Example: Access only from the library"
 msgstr "مثال: الوصول هنا فقط عن طريق المكتبة"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7790,10 +7801,6 @@ msgstr ""
 msgid "Genre or form of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8825,16 +8832,17 @@ msgid ""
 "work that is a subject of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr ""
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
 "(including conferences), place, temporal or work."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/de/LC_MESSAGES/messages.po b/rero_ils/translations/de/LC_MESSAGES/messages.po
index 23aa53f34e..6116e2b42a 100644
--- a/rero_ils/translations/de/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/de/LC_MESSAGES/messages.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.9.1\n"
 "Report-Msgid-Bugs-To: pascal.repond@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2024-05-16 14:23+0000\n"
 "Last-Translator: Pascal Repond <pascal.repond@rero.ch>\n"
 "Language: de\n"
@@ -5706,7 +5706,7 @@ msgstr "Fiktion"
 
 #: rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json:331
 msgid "non_fiction"
-msgstr "Sachbuch/Dokumentarfilm"
+msgstr "Sachthema"
 
 #: rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json:335
 #: rero_ils/modules/documents/jsonschemas/documents/document_content_media_carrier-v0.0.1.json:746
@@ -6412,10 +6412,13 @@ msgstr ""
 "Person, Familie oder Körperschaft (einschließlich Konferenzen) und ihre "
 "Rolle bei der Erstellung des Dokuments."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
-msgstr "Link zu einem Akteur"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
+msgstr "Link zu einer Entität"
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
@@ -6424,6 +6427,29 @@ msgstr ""
 "Link zu einer entfernten oder lokalen Entität des Typs Person, Familie "
 "oder Körperschaft (einschließlich Konferenzen)."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr "Entität (textuell)"
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+"Textliche Beschreibung einer Person, Familie oder Körperschaft "
+"(einschließlich Konferenzen). Wird in der Regel temporär verwendet, bis "
+"einer Link zu einer Entität hergestellt werden kann."
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr "Link zu einem Akteur"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6453,16 +6479,6 @@ msgstr "MEF Identifikator"
 msgid "Agent (textual)"
 msgstr "Akteur (textuell)"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-"Textliche Beschreibung einer Person, Familie oder Körperschaft "
-"(einschließlich Konferenzen). Wird in der Regel temporär verwendet, bis "
-"einer Link zu einer Entität hergestellt werden kann."
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7673,13 +7689,8 @@ msgstr "Öffentliche Anmerkung"
 msgid "Example: Access only from the library"
 msgstr "Beispiel: Zugang nur von der Bibliothek aus"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr "Entität (textuell)"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7783,10 +7794,6 @@ msgstr "(MARC 655)"
 msgid "Genre or form of the document."
 msgstr "Genre oder Form des Dokuments."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr "Link zu einer Entität"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8840,10 +8847,7 @@ msgstr ""
 "Thema, Person, Organisation (einschließlich Konferenzen), Ort, Zeitraum "
 "oder Werk, das Gegenstand des Dokuments ist."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr "Link zu einem Thema"
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
@@ -8852,6 +8856,10 @@ msgstr ""
 "Link zu einer entfernten oder lokalen Entität vom Typ Thema, Person, "
 "Körperschaft (einschließlich Konferenzen), Ort, Zeitraum oder Werk."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr "Link zu einem Thema"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/en/LC_MESSAGES/messages.po b/rero_ils/translations/en/LC_MESSAGES/messages.po
index 293d580809..e68120a9a1 100644
--- a/rero_ils/translations/en/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/en/LC_MESSAGES/messages.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.9.1\n"
 "Report-Msgid-Bugs-To: pascal.repond@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2024-05-16 14:23+0000\n"
 "Last-Translator: Pascal Repond <pascal.repond@rero.ch>\n"
 "Language: en\n"
@@ -6397,10 +6397,13 @@ msgstr ""
 "Person, family or corporate body (including conferences) and their "
 "contributing role for the document."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
-msgstr "Link to an agent"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
+msgstr "Link to an entity"
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
@@ -6409,6 +6412,29 @@ msgstr ""
 "Link to a remote or local entity of type person, family or corporate body"
 " (including conferences)."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr "Entity (textual)"
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr "Link to an agent"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6438,16 +6464,6 @@ msgstr "MEF ID"
 msgid "Agent (textual)"
 msgstr "Agent (textual)"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7655,13 +7671,8 @@ msgstr "Public note"
 msgid "Example: Access only from the library"
 msgstr "Example: Access only from the library"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr "Entity (textual)"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7762,10 +7773,6 @@ msgstr "(MARC 655)"
 msgid "Genre or form of the document."
 msgstr "Genre or form of the document."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr "Link to an entity"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8809,10 +8816,7 @@ msgstr ""
 "Topic, person, organisation (including conferences), place, temporal or "
 "work that is a subject of the document."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr "Link to a subject"
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
@@ -8821,6 +8825,10 @@ msgstr ""
 "Link to a remote or local entity of type topic, person, organisation "
 "(including conferences), place, temporal or work."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr "Link to a subject"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/eo/LC_MESSAGES/messages.po b/rero_ils/translations/eo/LC_MESSAGES/messages.po
index 350acd2f21..f871433cbe 100644
--- a/rero_ils/translations/eo/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/eo/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 1.0.1\n"
 "Report-Msgid-Bugs-To: software@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2021-06-09 13:00+0000\n"
 "Last-Translator: Nicolas Prongué <n.prongue@outlook.com>\n"
 "Language: eo\n"
@@ -6352,16 +6352,39 @@ msgid ""
 "contributing role for the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
 " (including conferences)."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6392,13 +6415,6 @@ msgstr ""
 msgid "Agent (textual)"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7579,13 +7595,8 @@ msgstr "Publika noto"
 msgid "Example: Access only from the library"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7676,10 +7687,6 @@ msgstr ""
 msgid "Genre or form of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8690,16 +8697,17 @@ msgid ""
 "work that is a subject of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr ""
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
 "(including conferences), place, temporal or work."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/es/LC_MESSAGES/messages.po b/rero_ils/translations/es/LC_MESSAGES/messages.po
index ab8898e624..f02ee44c5f 100644
--- a/rero_ils/translations/es/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/es/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.9.1\n"
 "Report-Msgid-Bugs-To: pascal.repond@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2024-03-26 11:02+0000\n"
 "Last-Translator: Pascal Repond <pascal.repond@rero.ch>\n"
 "Language: es\n"
@@ -6394,10 +6394,13 @@ msgstr ""
 "Persona, familia o entidad corporativa (incluidas conferencias) y su "
 "papel contribuyente al documento."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
-msgstr "Enlace a un agente"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
+msgstr "Enlace a una entidad"
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
@@ -6406,6 +6409,29 @@ msgstr ""
 "Enlace a una entidad remota o local de tipo persona, familia o entidad "
 "corporativa (incluyendo conferencias)."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr "Entidad (textual)"
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+"Descripción textual de una persona, familia o entidad corporativa "
+"(incluyendo conferencias). Normalmente se utiliza temporalmente hasta que"
+" se pueda establecer un enlace con una entidad."
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr "Enlace a un agente"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6435,16 +6461,6 @@ msgstr "MEF ID"
 msgid "Agent (textual)"
 msgstr "Agente (textual)"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-"Descripción textual de una persona, familia o entidad corporativa "
-"(incluyendo conferencias). Normalmente se utiliza temporalmente hasta que"
-" se pueda establecer un enlace con una entidad."
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7654,13 +7670,8 @@ msgstr "Nota pública"
 msgid "Example: Access only from the library"
 msgstr "Ejemplo: Acceso sólo desde la biblioteca"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr "Entidad (textual)"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7761,10 +7772,6 @@ msgstr "(MARC 655)"
 msgid "Genre or form of the document."
 msgstr "Género o forma del documento."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr "Enlace a una entidad"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8813,10 +8820,7 @@ msgstr ""
 "Tema, persona, entidad corporativa (incluyendo conferencias), lugar, "
 "temporal u obra que es un tema del documento."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr "Enlace a un sujeto"
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
@@ -8825,6 +8829,10 @@ msgstr ""
 "Enlace a una entidad remota o local de tipo tema, persona, entidad "
 "corporativa (incluyendo conferencias), lugar, temporal u obra."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr "Enlace a un sujeto"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/fr/LC_MESSAGES/messages.po b/rero_ils/translations/fr/LC_MESSAGES/messages.po
index fef035ec11..ab736b06d3 100644
--- a/rero_ils/translations/fr/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/fr/LC_MESSAGES/messages.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.9.1\n"
 "Report-Msgid-Bugs-To: pascal.repond@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2024-05-16 14:23+0000\n"
 "Last-Translator: Pascal Repond <pascal.repond@rero.ch>\n"
 "Language: fr\n"
@@ -5709,7 +5709,7 @@ msgstr "fiction"
 
 #: rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json:331
 msgid "non_fiction"
-msgstr "non-fiction/documentaire"
+msgstr "non-fiction"
 
 #: rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json:335
 #: rero_ils/modules/documents/jsonschemas/documents/document_content_media_carrier-v0.0.1.json:746
@@ -6410,10 +6410,13 @@ msgstr ""
 "Personne, famille ou collectivité (y compris les conférences) et son rôle"
 " de contribution au document."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
-msgstr "Lien à un agent"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
+msgstr "Lien à une entité"
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
@@ -6422,6 +6425,29 @@ msgstr ""
 "Lien à une entité externe ou locale de type personne, famille ou "
 "collectivité (y compris les conférences)."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr "Entité (textuelle)"
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+"Description textuelle d'une personne, d'une famille ou d'une collectivité"
+" (y compris conférences). Généralement temporaire, jusqu'à ce qu'un lien "
+"à une entité puisse être établi."
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr "Lien à un agent"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6451,16 +6477,6 @@ msgstr "Identifiant MEF"
 msgid "Agent (textual)"
 msgstr "Agent (textuel)"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-"Description textuelle d'une personne, d'une famille ou d'une collectivité"
-" (y compris conférences). Généralement temporaire, jusqu'à ce qu'un lien "
-"à une entité puisse être établi."
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7672,13 +7688,8 @@ msgstr "Note publique"
 msgid "Example: Access only from the library"
 msgstr "Exemple : Accès uniquement depuis la bibliothèque"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr "Entité (textuelle)"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7782,10 +7793,6 @@ msgstr "(MARC 655)"
 msgid "Genre or form of the document."
 msgstr "Genre ou forme du document."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr "Lien à une entité"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8838,10 +8845,7 @@ msgstr ""
 "Thème, personne, collectivité (y compris conférences), lieu, laps de "
 "temps ou œuvre qui est un sujet du document."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr "Lien à un sujet"
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
@@ -8850,6 +8854,10 @@ msgstr ""
 "Lien vers une entité distante ou locale de type thème, personne, "
 "collectivité (y compris conférences), lieu, laps de temps ou œuvre."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr "Lien à un sujet"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/it/LC_MESSAGES/messages.po b/rero_ils/translations/it/LC_MESSAGES/messages.po
index aa2bffb8bf..26e86e531a 100644
--- a/rero_ils/translations/it/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/it/LC_MESSAGES/messages.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.9.1\n"
 "Report-Msgid-Bugs-To: pascal.repond@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2024-05-16 14:23+0000\n"
 "Last-Translator: Pascal Repond <pascal.repond@rero.ch>\n"
 "Language: it\n"
@@ -6403,10 +6403,13 @@ msgstr ""
 "Persona, famiglia o ente (comprese le conferenze) e il loro ruolo di "
 "contributo al documento."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
-msgstr "Link a un agente"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
+msgstr "Link a un'entità"
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
@@ -6415,6 +6418,29 @@ msgstr ""
 "Link a un'entità remota o locale di tipo persona, famiglia o ente "
 "(comprese le conferenze)."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr "Entità (testuale)"
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+"Descrizione testuale di una persona, di una famiglia o di un ente "
+"(comprese le conferenze). Di solito viene utilizzato temporaneamente fino"
+" a quando non si riesce a stabilire un link con un'entità."
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr "Link a un agente"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6444,16 +6470,6 @@ msgstr "MEF ID"
 msgid "Agent (textual)"
 msgstr "Agente (testuale)"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-"Descrizione testuale di una persona, di una famiglia o di un ente "
-"(comprese le conferenze). Di solito viene utilizzato temporaneamente fino"
-" a quando non si riesce a stabilire un link con un'entità."
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7662,13 +7678,8 @@ msgstr "Nota pubblica"
 msgid "Example: Access only from the library"
 msgstr "Esempio: Accesso solo dalla biblioteca"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr "Entità (testuale)"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7771,10 +7782,6 @@ msgstr "(MARC 655)"
 msgid "Genre or form of the document."
 msgstr "Genere o forma del documento."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr "Link a un'entità"
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8826,10 +8833,7 @@ msgstr ""
 "Tema, persona, ente (comprese le conferenze), luogo, arco di tempo o "
 "opera che è soggetto del documento."
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr "Link a un sogetto"
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
@@ -8838,6 +8842,10 @@ msgstr ""
 "Link a un'entità remota o locale di tipo tema, persona, ente (comprese le"
 " conferenze), luogo, arco di tempo o opera."
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr "Link a un sogetto"
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/messages.pot b/rero_ils/translations/messages.pot
index 429de12722..6936b5bebe 100644
--- a/rero_ils/translations/messages.pot
+++ b/rero_ils/translations/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rero-ils 1.21.0\n"
+"Project-Id-Version: rero-ils 1.22.0\n"
 "Report-Msgid-Bugs-To: software@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6334,16 +6334,39 @@ msgid ""
 "contributing role for the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
 " (including conferences)."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6373,13 +6396,6 @@ msgstr ""
 msgid "Agent (textual)"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7560,13 +7576,8 @@ msgstr ""
 msgid "Example: Access only from the library"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7657,10 +7668,6 @@ msgstr ""
 msgid "Genre or form of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8671,16 +8678,17 @@ msgid ""
 "work that is a subject of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr ""
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
 "(including conferences), place, temporal or work."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/nl/LC_MESSAGES/messages.po b/rero_ils/translations/nl/LC_MESSAGES/messages.po
index 3cfbdc0675..91ec3cc2ed 100644
--- a/rero_ils/translations/nl/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.9.1\n"
 "Report-Msgid-Bugs-To: pascal.repond@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2024-02-23 17:02+0000\n"
 "Last-Translator: LievenSmets <lievensmets@me.com>\n"
 "Language: nl\n"
@@ -6389,16 +6389,39 @@ msgid ""
 "contributing role for the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
 " (including conferences)."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6429,13 +6452,6 @@ msgstr ""
 msgid "Agent (textual)"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7714,13 +7730,8 @@ msgstr "Openvare opmerking"
 msgid "Example: Access only from the library"
 msgstr "Voorbeeld: Toegang alleen vanuit de bibliotheek"
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7813,10 +7824,6 @@ msgstr ""
 msgid "Genre or form of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8875,16 +8882,17 @@ msgid ""
 "work that is a subject of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr ""
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
 "(including conferences), place, temporal or work."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/ru/LC_MESSAGES/messages.po b/rero_ils/translations/ru/LC_MESSAGES/messages.po
index 2da6a1559b..9015c8320d 100644
--- a/rero_ils/translations/ru/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/ru/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 1.7.0\n"
 "Report-Msgid-Bugs-To: software@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2022-01-21 16:53+0000\n"
 "Last-Translator: lushnikov3d37b9a0863842c1 <pavel.lushnikov@gmail.com>\n"
 "Language: ru\n"
@@ -6346,16 +6346,39 @@ msgid ""
 "contributing role for the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
 " (including conferences)."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6386,13 +6409,6 @@ msgstr ""
 msgid "Agent (textual)"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7573,13 +7589,8 @@ msgstr ""
 msgid "Example: Access only from the library"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7670,10 +7681,6 @@ msgstr ""
 msgid "Genre or form of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8684,16 +8691,17 @@ msgid ""
 "work that is a subject of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr ""
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
 "(including conferences), place, temporal or work."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/translations/zh_Hant/LC_MESSAGES/messages.po b/rero_ils/translations/zh_Hant/LC_MESSAGES/messages.po
index f03df5feb9..1c2f0b5139 100644
--- a/rero_ils/translations/zh_Hant/LC_MESSAGES/messages.po
+++ b/rero_ils/translations/zh_Hant/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 1.5.1\n"
 "Report-Msgid-Bugs-To: software@rero.ch\n"
-"POT-Creation-Date: 2024-05-28 12:59+0200\n"
+"POT-Creation-Date: 2024-06-06 16:53+0200\n"
 "PO-Revision-Date: 2021-12-25 09:52+0000\n"
 "Last-Translator: Sam Tse <codefzer@gmail.com>\n"
 "Language: zh_Hant\n"
@@ -6374,16 +6374,39 @@ msgid ""
 "contributing role for the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
-msgid "Link to an agent"
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:14
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:13
+msgid "Link to an entity"
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type person, family or corporate body"
 " (including conferences)."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:43
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
+#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
+#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:37
+msgid "Entity (textual)"
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json:44
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
+msgid ""
+"Textual description of a person, family or corporate body (including "
+"conferences). Usually used temporarily until a link to an entity can be "
+"established."
+msgstr ""
+
+#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:3
+msgid "Link to an agent"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_entity_link-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_work_access_point-v0.0.1.json:29
 msgid "Agent"
@@ -6415,13 +6438,6 @@ msgstr "med"
 msgid "Agent (textual)"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:5
-msgid ""
-"Textual description of a person, family or corporate body (including "
-"conferences). Usually used temporarily until a link to an entity can be "
-"established."
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_contribution_local-v0.0.1.json:31
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:38
 msgid "bf:Person"
@@ -7667,13 +7683,8 @@ msgstr ""
 msgid "Example: Access only from the library"
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:3
-#: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:100
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:30
-msgid "Entity (textual)"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_entity_local-v0.0.1.json:5
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:39
 msgid ""
 "Textual description of a topic, person, organisation (including "
 "conferences), place, temporal or work. Usually used temporarily until a "
@@ -7765,10 +7776,6 @@ msgstr "(MARC 655)"
 msgid "Genre or form of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:13
-msgid "Link to an entity"
-msgstr ""
-
 #: rero_ils/modules/documents/jsonschemas/documents/document_genre_form-v0.0.1.json:15
 msgid ""
 "Link to a remote or local entity of type topic accepted as a 'genre, "
@@ -8779,16 +8786,17 @@ msgid ""
 "work that is a subject of the document."
 msgstr ""
 
-#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
-msgid "Link to a subject"
-msgstr ""
-
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json:15
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:5
 msgid ""
 "Link to a remote or local entity of type topic, person, organisation "
 "(including conferences), place, temporal or work."
 msgstr ""
 
+#: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:3
+msgid "Link to a subject"
+msgstr ""
+
 #: rero_ils/modules/documents/jsonschemas/documents/document_subjects_entity_link-v0.0.1.json:29
 #: rero_ils/modules/entities/local_entities/jsonschemas/local_entities/local_entity_topic-v0.0.1.json:4
 msgid "Topic"
diff --git a/rero_ils/version.py b/rero_ils/version.py
index 525269655b..1932527361 100644
--- a/rero_ils/version.py
+++ b/rero_ils/version.py
@@ -23,4 +23,4 @@
 
 from __future__ import absolute_import, print_function
 
-__version__ = "1.22.0"
+__version__ = "1.22.1"
diff --git a/scripts/bootstrap b/scripts/bootstrap
index e95fb7a896..75b07b450f 100755
--- a/scripts/bootstrap
+++ b/scripts/bootstrap
@@ -151,7 +151,7 @@ then
   info_msg "Install RERO-ILS-UI from tgz: ${tgz_file}"
   npm install --no-save --only=prod --no-fund --no-audit  "${tgz_file}" --prefix "${static_folder}"
 else
-  npm install --no-save --only=prod --no-fund --no-audit  @rero/rero-ils-ui@17.0.0 --prefix "${static_folder}"
+  npm install --no-save --only=prod --no-fund --no-audit  @rero/rero-ils-ui@17.0.1 --prefix "${static_folder}"
 fi
 
 # build the web assets
diff --git a/scripts/setup b/scripts/setup
index f5bbb98446..ae30d10c10 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -237,7 +237,7 @@ info_msg "Delete invenio_circulations index"
 eval ${PREFIX} invenio index delete loans-loan-v1.0.0 --force --yes-i-know
 
 info_msg "Initialize files location to ${FILES_PATH}."
-eval rm -fr ${FILES_PATH}
+eval rm -fr ${FILES_PATH}/*
 eval ${PREFIX} invenio files location create --default fixtures ${FILES_PATH}
 
 if ${ES_MAPPING}