diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.yml b/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.yml
index f151d90c1a..8e9178ee77 100644
--- a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.yml
+++ b/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.yml
@@ -413,7 +413,7 @@ tables:
         - authtypecode: ""
           tagfield: "090"
           liblibrarian: "LOCAL CALL NUMBER (SERIES) [OBSOLETE]; LOCALLY ASSIGNED LC-TYPE CALL NUMBER (OCLC); LOCAL CALL NUMBER (RLIN)"
-          libopac: "LOCAL CALL NUMBER (SERIES) [OBSOLETE]; LOCALLY ASSIGNED LC-TYPE CALL NUMBER (OCLC); LOCAL CALL NUMBER (OCLC)"
+          libopac: "LOCAL CALL NUMBER (SERIES) [OBSOLETE]; LOCALLY ASSIGNED LC-TYPE CALL NUMBER (OCLC); LOCAL CALL NUMBER (RLIN)"
           repeatable: 1
           mandatory: 0
           authorised_value:
@@ -3927,7 +3927,7 @@ tables:
           tagfield: "053"
           tagsubfield: "a"
           liblibrarian: "Classification number element-single number or beginning number of span"
-          libopac: "Classification number element--single number or beginning number of span"
+          libopac: "Classification number element-single number or beginning number of span"
           repeatable: 0
           mandatory: 0
           tab: 0
@@ -3944,7 +3944,7 @@ tables:
           tagfield: "053"
           tagsubfield: "b"
           liblibrarian: "Classification number element-ending number of span"
-          libopac: "Classification number element--ending number of span"
+          libopac: "Classification number element-ending number of span"
           repeatable: 0
           mandatory: 0
           tab: 0
@@ -4505,7 +4505,7 @@ tables:
           tagfield: "065"
           tagsubfield: "a"
           liblibrarian: "Classification number element-single number or beginning of span"
-          libopac: "Classification number element--single number or beginning of span"
+          libopac: "Classification number element-single number or beginning of span"
           repeatable: 0
           mandatory: 0
           tab: 0
@@ -4522,7 +4522,7 @@ tables:
           tagfield: "065"
           tagsubfield: "b"
           liblibrarian: "Classification number element-ending number of span"
-          libopac: "Classification number element--ending number of span"
+          libopac: "Classification number element-ending number of span"
           repeatable: 0
           mandatory: 0
           tab: 0
@@ -5355,7 +5355,7 @@ tables:
           tagfield: "083"
           tagsubfield: "a"
           liblibrarian: "Classification number element-single number or beginning number of span"
-          libopac: "Classification number element--single number or beginning number of span"
+          libopac: "Classification number element-single number or beginning number of span"
           repeatable: 0
           mandatory: 0
           tab: 0
@@ -5372,7 +5372,7 @@ tables:
           tagfield: "083"
           tagsubfield: "b"
           liblibrarian: "Classification number element-ending number of span"
-          libopac: "Classification number element--ending number of span"
+          libopac: "Classification number element-ending number of span"
           repeatable: 0
           mandatory: 0
           tab: 0
@@ -5813,8 +5813,8 @@ tables:
         - authtypecode: ""
           tagfield: "087"
           tagsubfield: "b"
-          liblibrarian: "Classification number element-Ending number of span"
-          libopac: "Classification number element--Ending number of span"
+          liblibrarian: "Classification number element-ending number of span"
+          libopac: "Classification number element-ending number of span"
           repeatable: 0
           mandatory: 0
           tab: 0
diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml
index 0a5f2c90a0..1464de9eed 100644
--- a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml
+++ b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml
@@ -333,7 +333,7 @@ tables:
         - tagfield: "942"
           tagsubfield: "s"
           liblibrarian: "Serial record flag"
-          libopac: "Serial record"
+          libopac: "Serial record flag"
           repeatable: 0
           mandatory: 0
           kohafield: biblio.serial
@@ -529,7 +529,7 @@ tables:
         - tagfield: "952"
           tagsubfield: "9"
           liblibrarian: "Koha itemnumber (autogenerated)"
-          libopac: "Koha itemnumber"
+          libopac: "Koha itemnumber (autogenerated)"
           repeatable: 0
           mandatory: 0
           kohafield: items.itemnumber
@@ -547,7 +547,7 @@ tables:
         - tagfield: "952"
           tagsubfield: "a"
           liblibrarian: "Permanent location"
-          libopac: "Permanent Location"
+          libopac: "Permanent location"
           repeatable: 0
           mandatory: 0
           kohafield: items.homebranch
@@ -565,7 +565,7 @@ tables:
         - tagfield: "952"
           tagsubfield: "b"
           liblibrarian: "Current location"
-          libopac: "Current Location"
+          libopac: "Current location"
           repeatable: 0
           mandatory: 0
           kohafield: items.holdingbranch
@@ -13575,7 +13575,7 @@ tables:
         - tagfield: "243"
           tagsubfield: "a"
           liblibrarian: "Uniform title"
-          libopac: "Unifor title"
+          libopac: "Uniform title"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -13899,7 +13899,7 @@ tables:
         - tagfield: "245"
           tagsubfield: "d"
           liblibrarian: "Designation of section/part/series (SE) [OBSOLETE]"
-          libopac: "Designation of section section/part/series: (SE) [OBSOLETE]"
+          libopac: "Designation of section/part/series (SE) [OBSOLETE]"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -14151,7 +14151,7 @@ tables:
         - tagfield: "246"
           tagsubfield: "d"
           liblibrarian: "Designation of section/part/series (SE) [OBSOLETE]"
-          libopac: "Designation of section section/part/series (SE) [OBSOLETE]"
+          libopac: "Designation of section/part/series (SE) [OBSOLETE]"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -18291,7 +18291,7 @@ tables:
         - tagfield: "342"
           tagsubfield: "b"
           liblibrarian: "Coordinate units or distance units"
-          libopac: "Coordinate unist or distance units"
+          libopac: "Coordinate units or distance units"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -45075,7 +45075,7 @@ tables:
         - tagfield: "770"
           tagsubfield: "8"
           liblibrarian: "Field link and sequence number"
-          libopac: "Field link and sequence number "
+          libopac: "Field link and sequence number"
           repeatable: 1
           mandatory: 0
           kohafield:
@@ -53588,8 +53588,8 @@ tables:
 
         - tagfield: "811"
           tagsubfield: "8"
-          liblibrarian: "Field link and sequence number "
-          libopac: "Field link and sequence number "
+          liblibrarian: "Field link and sequence number"
+          libopac: "Field link and sequence number"
           repeatable: 1
           mandatory: 0
           kohafield:
@@ -64226,8 +64226,8 @@ tables:
 
         - tagfield: "898"
           tagsubfield: "8"
-          liblibrarian: "Field link and sequence number "
-          libopac: "Field link and sequence number "
+          liblibrarian: "Field link and sequence number"
+          libopac: "Field link and sequence number"
           repeatable: 1
           mandatory: 0
           kohafield:
@@ -70761,7 +70761,7 @@ tables:
         - tagfield: "943"
           tagsubfield: "a"
           liblibrarian: "Uniform title"
-          libopac: "Unifor title"
+          libopac: "Uniform title"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -76322,8 +76322,8 @@ tables:
 
         - tagfield: "982"
           tagsubfield: "8"
-          liblibrarian: "Field link and sequence number "
-          libopac: "Field link and sequence number "
+          liblibrarian: "Field link and sequence number"
+          libopac: "Field link and sequence number"
           repeatable: 1
           mandatory: 0
           kohafield:
@@ -77151,7 +77151,7 @@ tables:
         - tagfield: "987"
           tagsubfield: "d"
           liblibrarian: "Status code"
-          libopac: "Status code "
+          libopac: "Status code"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -77403,7 +77403,7 @@ tables:
         - tagfield: "995"
           tagsubfield: "9"
           liblibrarian: "Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]"
-          libopac: "Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]"
+          libopac: "Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -77420,7 +77420,7 @@ tables:
 
         - tagfield: "995"
           tagsubfield: "a"
-          liblibrarian: "Origin of the item (home branch) (free text)"
+          liblibrarian: "Origin of item (home branch) (free text)"
           libopac: "Origin of item (home branch) (free text)"
           repeatable: 0
           mandatory: 0
@@ -77439,7 +77439,7 @@ tables:
         - tagfield: "995"
           tagsubfield: "b"
           liblibrarian: "Origin of item (home branch) (coded)"
-          libopac: "Origin of item (home branch (coded)"
+          libopac: "Origin of item (home branch) (coded)"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -77493,7 +77493,7 @@ tables:
         - tagfield: "995"
           tagsubfield: "e"
           liblibrarian: "Genre detail"
-          libopac: "Genre"
+          libopac: "Genre detail"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -77619,7 +77619,7 @@ tables:
         - tagfield: "995"
           tagsubfield: "l"
           liblibrarian: "Numbering (volume or other part)"
-          libopac: "Numbering (bound volume or other part)"
+          libopac: "Numbering (volume or other part)"
           repeatable: 0
           mandatory: 0
           kohafield: ""
@@ -77925,7 +77925,7 @@ tables:
         - tagfield: "998"
           tagsubfield: "d"
           liblibrarian: "First date, FD (RLIN)"
-          libopac: "First Date, FD (RLIN)"
+          libopac: "First date, FD (RLIN)"
           repeatable: 0
           mandatory: 0
           kohafield: ""