From 74278fa72e800f45b03b2980e29b7e40a819648e Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Sat, 29 Nov 2014 13:31:26 +0100
Subject: [PATCH] [PASSED QA] Bug 9124: Remove non-existing field mapping and auth value for 942$e

942$e is mapped to biblioitems.cn_edition, which doesn't exist and
to an authorized value CN_EDITION, which doesn't exist either.

Patch removes the wrong mapping and non-existing auth value from
the frameworks.

To test:
- git diff --color-words HEAD^ is helpful
- Check all mappings are changed and SQL is still valid

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++++--------
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++++--------
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++++--------
 .../Obligatoire/marc21_framework_DEFAULT.sql       |    2 +-
 .../Optionnel/marc21_simple_bib_frameworks.sql     |   16 ++++++++--------
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++++--------
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++++--------
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +-
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++++++++--------
 .../mandatory/unimarc_framework_DEFAULT.sql        |    4 ++--
 .../marc21_bibliographic_DEFAULT_local.sql         |    2 +-
 .../optional/marc21_bibliographic_AR_local.sql     |    2 +-
 .../optional/marc21_bibliographic_BKS_local.sql    |    2 +-
 .../optional/marc21_bibliographic_CF_local.sql     |    2 +-
 .../optional/marc21_bibliographic_IR_local.sql     |    2 +-
 .../optional/marc21_bibliographic_KT_local.sql     |    2 +-
 .../optional/marc21_bibliographic_SER_local.sql    |    2 +-
 .../optional/marc21_bibliographic_SR_local.sql     |    2 +-
 .../optional/marc21_bibliographic_VR_local.sql     |    2 +-
 .../unimarc_bibliographic_DEFAULT_local_995.sql    |    3 +--
 ...rc_bibliographic_DEFAULT_local_952_obsolete.sql |    2 +-
 .../marc21_bibliographic_DEFAULT_local.sql         |    2 +-
 .../optional/marc21_bibliographic_AR_local.sql     |    2 +-
 .../optional/marc21_bibliographic_BKS_local.sql    |    2 +-
 .../optional/marc21_bibliographic_CF_local.sql     |    2 +-
 .../optional/marc21_bibliographic_IR_local.sql     |    2 +-
 .../optional/marc21_bibliographic_KT_local.sql     |    2 +-
 .../optional/marc21_bibliographic_SER_local.sql    |    2 +-
 .../optional/marc21_bibliographic_SR_local.sql     |    2 +-
 .../optional/marc21_bibliographic_VR_local.sql     |    2 +-
 .../unimarc_bibliographic_DEFAULT_local_995.sql    |    3 +--
 .../optional/unimarc_bibliographic_AN_local.sql    |    3 +--
 .../optional/unimarc_bibliographic_AUD_local.sql   |    3 +--
 .../optional/unimarc_bibliographic_BOOK_local.sql  |    3 +--
 ...rc_bibliographic_DEFAULT_local_952_obsolete.sql |    2 +-
 .../optional/unimarc_bibliographic_EL_local.sql    |    3 +--
 .../optional/unimarc_bibliographic_MIN_local.sql   |    3 +--
 .../optional/unimarc_bibliographic_NOTE_local.sql  |    3 +--
 .../optional/unimarc_bibliographic_PER_local.sql   |    3 +--
 .../optional/unimarc_bibliographic_TECH_local.sql  |    3 +--
 45 files changed, 95 insertions(+), 105 deletions(-)

diff --git a/installer/data/mysql/de-DE/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/de-DE/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index 8907e1b..a5016c9 100644
--- a/installer/data/mysql/de-DE/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/de-DE/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -60,7 +60,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib
 		('942', '6', 'Normalisierte Klassifikation für Sortierung (Koha)', 'Normalisierte Klassifikation für Sortierung (Koha)', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
 		('942', 'a', 'Institutionscode [OBSOLETE]', 'Institutionscode [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, '', '', '', NULL),
 		('942', 'c', 'Koha-Medientyp', 'Koha-Medientyp', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
-		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, '', '', '', NULL),
+		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, NULL, 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'h', 'Klassifikationsteil', 'Klassifikationsteil', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'i', 'Exemplarteil', 'Exemplarteil', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'k', 'Signatur-Präfix', 'Signatur-Präfix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, '', '', '', NULL),
diff --git a/installer/data/mysql/de-DE/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/de-DE/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index 8616bf5..fb12846 100644
--- a/installer/data/mysql/de-DE/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/de-DE/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -135,7 +135,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Normalisierte Klassifikation für Sortierung (Koha)', 'Normalisierte Klassifikation für Sortierung (Koha)', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
 		('942', 'a', 'Institutionscode [OBSOLETE]', 'Institutionscode [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'BKS', '', '', NULL),
 		('942', 'c', 'Koha-Medientyp', 'Koha-Medientyp', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'BKS', '', '', NULL),
-		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, NULL, 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'h', 'Klassifikationsteil', 'Klassifikationsteil', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'i', 'Exemplarteil', 'Exemplarteil', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'BKS', '', '', NULL),
 		('942', 'k', 'Signatur-Präfix', 'Signatur-Präfix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
@@ -4142,7 +4142,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Normalisierte Klassifikation für Sortierung (Koha)', 'Normalisierte Klassifikation für Sortierung (Koha)', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
 		('942', 'a', 'Institutionscode [OBSOLETE]', 'Institutionscode [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'CF', '', '', NULL),
 		('942', 'c', 'Koha-Medientyp', 'Koha-Medientyp', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'CF', '', '', NULL),
-		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'CF', '', '', NULL),
+		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, NULL, 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'h', 'Klassifikationsteil', 'Klassifikationsteil', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'i', 'Exemplarteil', 'Exemplarteil', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'CF', '', '', NULL),
 		('942', 'k', 'Signatur-Präfix', 'Signatur-Präfix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
@@ -8150,7 +8150,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Normalisierte Klassifikation für Sortierung (Koha)', 'Normalisierte Klassifikation für Sortierung (Koha)', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
 		('942', 'a', 'Institutionscode [OBSOLETE]', 'Institutionscode [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SR', '', '', NULL),
 		('942', 'c', 'Koha-Medientyp', 'Koha-Medientyp', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SR', '', '', NULL),
-		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SR', '', '', NULL),
+		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'h', 'Klassifikationsteil', 'Klassifikationsteil', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'i', 'Exemplarteil', 'Exemplarteil', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SR', '', '', NULL),
 		('942', 'k', 'Signatur-Präfix', 'Signatur-Präfix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
@@ -12157,7 +12157,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Normalisierte Klassifikation für Sortierung (Koha)', 'Normalisierte Klassifikation für Sortierung (Koha)', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
 		('942', 'a', 'Institutionscode [OBSOLETE]', 'Institutionscode [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'VR', '', '', NULL),
 		('942', 'c', 'Koha-Medientyp', 'Koha-Medientyp', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'VR', '', '', NULL),
-		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'VR', '', '', NULL),
+		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, NULL, 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'h', 'Klassifikationsteil', 'Klassifikationsteil', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'i', 'Exemplarteil', 'Exemplarteil', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'VR', '', '', NULL),
 		('942', 'k', 'Signatur-Präfix', 'Signatur-Präfix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
@@ -16163,7 +16163,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Normalisierte Klassifikation für Sortierung (Koha)', 'Normalisierte Klassifikation für Sortierung (Koha)', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
 		('942', 'a', 'Institutionscode [OBSOLETE]', 'Institutionscode [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'AR', '', '', NULL),
 		('942', 'c', 'Koha-Medientyp', 'Koha-Medientyp', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'AR', '', '', NULL),
-		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'AR', '', '', NULL),
+		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, NULL, 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'h', 'Klassifikationsteil', 'Klassifikationsteil', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'i', 'Exemplarteil', 'Exemplarteil', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'AR', '', '', NULL),
 		('942', 'k', 'Signatur-Präfix', 'Signatur-Präfix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
@@ -20168,7 +20168,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Normalisierte Klassifikation für Sortierung (Koha)', 'Normalisierte Klassifikation für Sortierung (Koha)', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
 		('942', 'a', 'Institutionscode [OBSOLETE]', 'Institutionscode [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'KT', '', '', NULL),
 		('942', 'c', 'Koha-Medientyp', 'Koha-Medientyp', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'KT', '', '', NULL),
-		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'KT', '', '', NULL),
+		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, NULL, 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'h', 'Klassifikationsteil', 'Klassifikationsteil', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'i', 'Exemplarteil', 'Exemplarteil', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'KT', '', '', NULL),
 		('942', 'k', 'Signatur-Präfix', 'Signatur-Präfix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
@@ -24174,7 +24174,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Normalisierte Klassifikation für Sortierung (Koha)', 'Normalisierte Klassifikation für Sortierung (Koha)', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
 		('942', 'a', 'Institutionscode [OBSOLETE]', 'Institutionscode [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'IR', '', '', NULL),
 		('942', 'c', 'Koha-Medientyp', 'Koha-Medientyp', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'IR', '', '', NULL),
-		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'IR', '', '', NULL),
+		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, NULL, 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'h', 'Klassifikationsteil', 'Klassifikationsteil', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'i', 'Exemplarteil', 'Exemplarteil', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'IR', '', '', NULL),
 		('942', 'k', 'Signatur-Präfix', 'Signatur-Präfix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
@@ -28178,7 +28178,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Normalisierte Klassifikation für Sortierung (Koha)', 'Normalisierte Klassifikation für Sortierung (Koha)', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
 		('942', 'a', 'Institutionscode [OBSOLETE]', 'Institutionscode [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SER', '', '', NULL),
 		('942', 'c', 'Koha-Medientyp', 'Koha-Medientyp', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SER', '', '', NULL),
-		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SER', '', '', NULL),
+		('942', 'e', 'Ausgabe', 'Ausgabe', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'h', 'Klassifikationsteil', 'Klassifikationsteil', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'i', 'Exemplarteil', 'Exemplarteil', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SER', '', '', NULL),
 		('942', 'k', 'Signatur-Präfix', 'Signatur-Präfix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index e388649..f8d66bc 100644
--- a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -60,7 +60,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, '', '', '', NULL),
             ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, '', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, '', '', '', NULL),
diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index d0a2591..0c80d58 100644
--- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -135,7 +135,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'BKS', '', '', NULL),
            ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'BKS', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'BKS', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
@@ -4142,7 +4142,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'CF', '', '', NULL),
               ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'CF', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'CF', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'CF', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
@@ -8150,7 +8150,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SR', '', '', NULL),
               ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
@@ -12157,7 +12157,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'VR', '', '', NULL),
               ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'VR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'VR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'VR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
@@ -16163,7 +16163,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'AR', '', '', NULL),
               ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'AR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'AR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'AR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
@@ -20168,7 +20168,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'KT', '', '', NULL),
               ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'KT', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'KT', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'KT', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
@@ -24174,7 +24174,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'IR', '', '', NULL),
               ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'IR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'IR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'IR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
@@ -28178,7 +28178,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SER', '', '', NULL),
            ('942', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SER', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SER', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SER', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index e2ebfd3..dce46e5 100644
--- a/installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -60,7 +60,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib
 		('942', '6', 'Koha clasificación normalizada para ordenar', 'Koha clasificación normalizada para ordenar', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
 		('942', 'a', 'Código de la institución [OBSOLETO]', 'Código de la institución [OBSOLETO]', 0, 0, '', 9, '', '', '', NULL, -5, '', '', '', NULL),
 		('942', 'c', 'Tipo de ítem Koha', 'Tipo de ítem Koha', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
-		('942', 'e', 'Edición', 'Edición', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, '', '', '', NULL),
+		('942', 'e', 'Edición', 'Edición', 0, 0, NULL, 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'h', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'i', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'k', 'Prefijo de la signatura', 'Prefijo de la signatura', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, '', '', '', NULL),
diff --git a/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index 66cf596..f5cb8bf 100644
--- a/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -135,7 +135,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha clasificación normalizada para ordenar', 'Koha clasificación normalizada para ordenar', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
 		('942', 'a', 'Código de la institución [OBSOLETO]', 'Código de la institución [OBSOLETO]', 0, 0, '', 9, '', '', '', NULL, -5, 'BKS', '', '', NULL),
 		('942', 'c', 'Tipo de ítem Koha', 'Tipo de ítem Koha', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'BKS', '', '', NULL),
-		('942', 'e', 'Edición', 'Edición', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('942', 'e', 'Edición', 'Edición', 0, 0, NULL, 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'h', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'i', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'BKS', '', '', NULL),
 		('942', 'k', 'Prefijo de la signatura', 'Prefijo de la signatura', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
@@ -4142,7 +4142,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha clasificación normalizada para ordenar', 'Koha clasificación normalizada para ordenar', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
 		('942', 'a', 'Código de la institución [OBSOLETO]', 'Código de la institución [OBSOLETO]', 0, 0, '', 9, '', '', '', NULL, -5, 'CF', '', '', NULL),
 		('942', 'c', 'Tipo de ítem Koha', 'Tipo de ítem Koha', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'CF', '', '', NULL),
-		('942', 'e', 'Edición', 'Edición', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'CF', '', '', NULL),
+		('942', 'e', 'Edición', 'Edición', 0, 0, NULL, 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'h', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'i', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'CF', '', '', NULL),
 		('942', 'k', 'Prefijo de la signatura', 'Prefijo de la signatura', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
@@ -8150,7 +8150,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha clasificación normalizada para ordenar', 'Koha clasificación normalizada para ordenar', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
 		('942', 'a', 'Código de la institución [OBSOLETO]', 'Código de la institución [OBSOLETO]', 0, 0, '', 9, '', '', '', NULL, -5, 'SR', '', '', NULL),
 		('942', 'c', 'Tipo de ítem Koha', 'Tipo de ítem Koha', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SR', '', '', NULL),
-		('942', 'e', 'Edición', 'Edición', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SR', '', '', NULL),
+		('942', 'e', 'Edición', 'Edición', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'h', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'i', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SR', '', '', NULL),
 		('942', 'k', 'Prefijo de la signatura', 'Prefijo de la signatura', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
@@ -12157,7 +12157,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha clasificación normalizada para ordenar', 'Koha clasificación normalizada para ordenar', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
 		('942', 'a', 'Código de la institución [OBSOLETO]', 'Código de la institución [OBSOLETO]', 0, 0, '', 9, '', '', '', NULL, -5, 'VR', '', '', NULL),
 		('942', 'c', 'Tipo de ítem Koha', 'Tipo de ítem Koha', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'VR', '', '', NULL),
-		('942', 'e', 'Edición', 'Edición', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'VR', '', '', NULL),
+		('942', 'e', 'Edición', 'Edición', 0, 0, NULL, 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'h', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'i', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'VR', '', '', NULL),
 		('942', 'k', 'Prefijo de la signatura', 'Prefijo de la signatura', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
@@ -16163,7 +16163,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha clasificación normalizada para ordenar', 'Koha clasificación normalizada para ordenar', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
 		('942', 'a', 'Código de la institución [OBSOLETO]', 'Código de la institución [OBSOLETO]', 0, 0, '', 9, '', '', '', NULL, -5, 'AR', '', '', NULL),
 		('942', 'c', 'Tipo de ítem Koha', 'Tipo de ítem Koha', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'AR', '', '', NULL),
-		('942', 'e', 'Edición', 'Edición', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'AR', '', '', NULL),
+		('942', 'e', 'Edición', 'Edición', 0, 0, NULL, 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'h', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'i', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'AR', '', '', NULL),
 		('942', 'k', 'Prefijo de la signatura', 'Prefijo de la signatura', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
@@ -20168,7 +20168,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha clasificación normalizada para ordenar', 'Koha clasificación normalizada para ordenar', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
 		('942', 'a', 'Código de la institución [OBSOLETO]', 'Código de la institución [OBSOLETO]', 0, 0, '', 9, '', '', '', NULL, -5, 'KT', '', '', NULL),
 		('942', 'c', 'Tipo de ítem Koha', 'Tipo de ítem Koha', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'KT', '', '', NULL),
-		('942', 'e', 'Edición', 'Edición', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'KT', '', '', NULL),
+		('942', 'e', 'Edición', 'Edición', 0, 0, NULL, 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'h', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'i', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'KT', '', '', NULL),
 		('942', 'k', 'Prefijo de la signatura', 'Prefijo de la signatura', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
@@ -24174,7 +24174,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha clasificación normalizada para ordenar', 'Koha clasificación normalizada para ordenar', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
 		('942', 'a', 'Código de la institución [OBSOLETO]', 'Código de la institución [OBSOLETO]', 0, 0, '', 9, '', '', '', NULL, -5, 'IR', '', '', NULL),
 		('942', 'c', 'Tipo de ítem Koha', 'Tipo de ítem Koha', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'IR', '', '', NULL),
-		('942', 'e', 'Edición', 'Edición', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'IR', '', '', NULL),
+		('942', 'e', 'Edición', 'Edición', 0, 0, NULL, 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'h', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'i', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'IR', '', '', NULL),
 		('942', 'k', 'Prefijo de la signatura', 'Prefijo de la signatura', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
@@ -28178,7 +28178,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha clasificación normalizada para ordenar', 'Koha clasificación normalizada para ordenar', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
 		('942', 'a', 'Código de la institución [OBSOLETO]', 'Código de la institución [OBSOLETO]', 0, 0, '', 9, '', '', '', NULL, -5, 'SER', '', '', NULL),
 		('942', 'c', 'Tipo de ítem Koha', 'Tipo de ítem Koha', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SER', '', '', NULL),
-		('942', 'e', 'Edición', 'Edición', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SER', '', '', NULL),
+		('942', 'e', 'Edición', 'Edición', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'h', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 'Parte de la signatura que corresponde a la clasificación (Parte de la clasificación)', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'i', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 'Parte de la signatura que identifica el ejemplar (Parte del ítem)', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SER', '', '', NULL),
 		('942', 'k', 'Prefijo de la signatura', 'Prefijo de la signatura', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql b/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql
index adab600..91dac51 100644
--- a/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql
@@ -76,7 +76,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, '', '', '', NULL),
 		('942', 'c', 'Koha [default] item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, '', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, '', '', '', NULL),
diff --git a/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql b/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql
index 277685a..6cf39ca 100644
--- a/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql
@@ -135,7 +135,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'BKS', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'BKS', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'BKS', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
@@ -4061,7 +4061,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'CF', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'CF', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'CF', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'CF', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
@@ -7988,7 +7988,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
@@ -11914,7 +11914,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'VR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'VR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'VR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'VR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
@@ -15839,7 +15839,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'AR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'AR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'AR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'AR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
@@ -19763,7 +19763,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'KT', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'KT', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'KT', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'KT', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
@@ -23688,7 +23688,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'IR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'IR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'IR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'IR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
@@ -27611,7 +27611,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SER', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SER', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SER', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SER', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/it-IT/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/it-IT/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index a1c99d8..56cfaeb 100644
--- a/installer/data/mysql/it-IT/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/it-IT/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -60,7 +60,7 @@ INSERT IGNORE INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblib
 		('942', '6', 'Class. Normalizzata per ordinamento', 'Class. Normalizzata per ordinamento', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, '', '', '', NULL),
 		('942', 'c', 'Tipo copia default (Koha)', 'Tipo copia default (Koha)', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
-		('942', 'e', 'Edizione', 'Edizione', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, '', '', '', NULL),
+		('942', 'e', 'Edizione', 'Edizione', 0, 0, NULL, 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'h', 'Parte della classificazione', 'Parte della classificazione', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'i', 'Parte dell\'item', 'Parte dell\'item', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'k', 'Prefisso del numero di chiamata (collocazione)', 'Prefisso del numero di chiamata (collocazione)', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, '', '', '', NULL),
diff --git a/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index 3ad2460..184753a 100644
--- a/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -135,7 +135,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Class. Normalizzata per ordinamento', 'Class. Normalizzata per ordinamento', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'BKS', '', '', NULL),
 		('942', 'c', 'Tipo copia default (Koha)', 'Tipo copia default (Koha)', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'BKS', '', '', NULL),
-		('942', 'e', 'Edizione', 'Edizione', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('942', 'e', 'Edizione', 'Edizione', 0, 0, NULL, 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'h', 'Parte della classificazione', 'Parte della classificazione', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'i', 'Parte dell\'item', 'Parte dell\'item', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'BKS', '', '', NULL),
 		('942', 'k', 'Prefisso del numero di chiamata (collocazione)', 'Prefisso del numero di chiamata (collocazione)', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
@@ -4142,7 +4142,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Class. Normalizzata per ordinamento', 'Class. Normalizzata per ordinamento', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'CF', '', '', NULL),
 		('942', 'c', 'Tipo copia default (Koha)', 'Tipo copia default (Koha)', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'CF', '', '', NULL),
-		('942', 'e', 'Edizione', 'Edizione', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'CF', '', '', NULL),
+		('942', 'e', 'Edizione', 'Edizione', 0, 0, NULL, 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'h', 'Parte della classificazione', 'Parte della classificazione', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'i', 'Parte dell\'item', 'Parte dell\'item', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'CF', '', '', NULL),
 		('942', 'k', 'Prefisso del numero di chiamata (collocazione)', 'Prefisso del numero di chiamata (collocazione)', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
@@ -8150,7 +8150,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Class. Normalizzata per ordinamento', 'Class. Normalizzata per ordinamento', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SR', '', '', NULL),
 		('942', 'c', 'Tipo copia default (Koha)', 'Tipo copia default (Koha)', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SR', '', '', NULL),
-		('942', 'e', 'Edizione', 'Edizione', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SR', '', '', NULL),
+		('942', 'e', 'Edizione', 'Edizione', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'h', 'Parte della classificazione', 'Parte della classificazione', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'i', 'Parte dell\'item', 'Parte dell\'item', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SR', '', '', NULL),
 		('942', 'k', 'Prefisso del numero di chiamata (collocazione)', 'Prefisso del numero di chiamata (collocazione)', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
@@ -12157,7 +12157,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Class. Normalizzata per ordinamento', 'Class. Normalizzata per ordinamento', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'VR', '', '', NULL),
 		('942', 'c', 'Tipo copia default (Koha)', 'Tipo copia default (Koha)', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'VR', '', '', NULL),
-		('942', 'e', 'Edizione', 'Edizione', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'VR', '', '', NULL),
+		('942', 'e', 'Edizione', 'Edizione', 0, 0, NULL, 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'h', 'Parte della classificazione', 'Parte della classificazione', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'i', 'Parte dell\'item', 'Parte dell\'item', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'VR', '', '', NULL),
 		('942', 'k', 'Prefisso del numero di chiamata (collocazione)', 'Prefisso del numero di chiamata (collocazione)', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
@@ -16163,7 +16163,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Class. Normalizzata per ordinamento', 'Class. Normalizzata per ordinamento', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'AR', '', '', NULL),
 		('942', 'c', 'Tipo copia default (Koha)', 'Tipo copia default (Koha)', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'AR', '', '', NULL),
-		('942', 'e', 'Edizione', 'Edizione', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'AR', '', '', NULL),
+		('942', 'e', 'Edizione', 'Edizione', 0, 0, NULL, 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'h', 'Parte della classificazione', 'Parte della classificazione', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'i', 'Parte dell\'item', 'Parte dell\'item', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'AR', '', '', NULL),
 		('942', 'k', 'Prefisso del numero di chiamata (collocazione)', 'Prefisso del numero di chiamata (collocazione)', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
@@ -20168,7 +20168,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Class. Normalizzata per ordinamento', 'Class. Normalizzata per ordinamento', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'KT', '', '', NULL),
 		('942', 'c', 'Tipo copia default (Koha)', 'Tipo copia default (Koha)', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'KT', '', '', NULL),
-		('942', 'e', 'Edizione', 'Edizione', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'KT', '', '', NULL),
+		('942', 'e', 'Edizione', 'Edizione', 0, 0, NULL, 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'h', 'Parte della classificazione', 'Parte della classificazione', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'i', 'Parte dell\'item', 'Parte dell\'item', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'KT', '', '', NULL),
 		('942', 'k', 'Prefisso del numero di chiamata (collocazione)', 'Prefisso del numero di chiamata (collocazione)', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
@@ -24174,7 +24174,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Class. Normalizzata per ordinamento', 'Class. Normalizzata per ordinamento', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'IR', '', '', NULL),
 		('942', 'c', 'Tipo copia default (Koha)', 'Tipo copia default (Koha)', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'IR', '', '', NULL),
-		('942', 'e', 'Edizione', 'Edizione', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'IR', '', '', NULL),
+		('942', 'e', 'Edizione', 'Edizione', 0, 0, NULL, 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'h', 'Parte della classificazione', 'Parte della classificazione', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'i', 'Parte dell\'item', 'Parte dell\'item', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'IR', '', '', NULL),
 		('942', 'k', 'Prefisso del numero di chiamata (collocazione)', 'Prefisso del numero di chiamata (collocazione)', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
@@ -28178,7 +28178,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Class. Normalizzata per ordinamento', 'Class. Normalizzata per ordinamento', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SER', '', '', NULL),
 		('942', 'c', 'Tipo copia default (Koha)', 'Tipo copia default (Koha)', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SER', '', '', NULL),
-		('942', 'e', 'Edizione', 'Edizione', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SER', '', '', NULL),
+		('942', 'e', 'Edizione', 'Edizione', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'h', 'Parte della classificazione', 'Parte della classificazione', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'i', 'Parte dell\'item', 'Parte dell\'item', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SER', '', '', NULL),
 		('942', 'k', 'Prefisso del numero di chiamata (collocazione)', 'Prefisso del numero di chiamata (collocazione)', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index ac32486..68f74d0 100644
--- a/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -76,7 +76,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, '', '', '', NULL),
 		('942', 'c', 'Koha [default] item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, '', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, '', '', '', NULL),
diff --git a/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index 28f4644..7977b14 100644
--- a/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -135,7 +135,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'BKS', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'BKS', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'BKS', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
@@ -4060,7 +4060,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'CF', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'CF', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'CF', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'CF', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
@@ -7986,7 +7986,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
@@ -11911,7 +11911,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'VR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'VR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'VR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'VR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
@@ -15835,7 +15835,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'AR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'AR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'AR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'AR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
@@ -19758,7 +19758,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'KT', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'KT', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'KT', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'KT', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
@@ -23682,7 +23682,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'IR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'IR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'IR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'IR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
@@ -27604,7 +27604,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SER', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SER', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SER', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SER', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index 81262a6..030b5d8 100644
--- a/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -76,7 +76,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, '', '', '', NULL),
 		('942', 'c', 'Koha [default] item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, '', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, '', '', '', NULL),
diff --git a/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
index a9666ac..7bbe212 100644
--- a/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
+++ b/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
@@ -135,7 +135,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'BKS', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'BKS', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'BKS', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'BKS', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'BKS', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'BKS', '', '', NULL),
@@ -4061,7 +4061,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'CF', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'CF', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'CF', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'CF', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'CF', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'CF', '', '', NULL),
@@ -7988,7 +7988,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SR', '', '', NULL),
@@ -11914,7 +11914,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'VR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'VR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'VR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'VR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'VR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'VR', '', '', NULL),
@@ -15839,7 +15839,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'AR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'AR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'AR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'AR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'AR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'AR', '', '', NULL),
@@ -19763,7 +19763,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'KT', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'KT', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'KT', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'KT', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'KT', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'KT', '', '', NULL),
@@ -23688,7 +23688,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'IR', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'IR', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'IR', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'IR', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'IR', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'IR', '', '', NULL),
@@ -27611,7 +27611,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('942', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, 'SER', '', '', NULL),
 		('942', 'a', 'Institution code [OBSOLETE]', 'Institution code [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, 'SER', '', '', NULL),
 		('942', 'c', 'Item type', 'Item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, 'SER', '', '', NULL),
-		('942', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, 'SER', '', '', NULL),
+		('942', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
 		('942', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, 'SER', '', '', NULL),
 		('942', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, 'SER', '', '', NULL),
diff --git a/installer/data/mysql/pl-PL/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql b/installer/data/mysql/pl-PL/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
index 60509e1..f355884 100644
--- a/installer/data/mysql/pl-PL/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
+++ b/installer/data/mysql/pl-PL/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
@@ -82,7 +82,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('990', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'biblioitems.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL),
 		('990', 'a', 'Koha item type [OBSOLETE]', 'Koha item type [OBSOLETE]', 0, 0, '', 9, '', '', '', NULL, -5, '', '', '', NULL),
 		('990', 'c', 'Koha item type', 'Koha item type', 0, 1, 'biblioitems.itemtype', 9, 'itemtypes', '', '', NULL, 0, '', '', '', NULL),
-		('990', 'e', 'Edition', 'Edition', 0, 0, 'biblioitems.cn_edition', 9, 'CN_EDITION', '', '', NULL, 0, '', '', '', NULL),
+		('990', 'e', 'Edition', 'Edition', 0, 0, NULL, 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('990', 'h', 'Classification part', 'Classification part', 0, 0, 'biblioitems.cn_class', 9, '', '', '', NULL, 0, '', '', '', NULL),
 		('990', 'i', 'Item part', 'Item part', 1, 0, 'biblioitems.cn_item', 9, '', '', '', NULL, 9, '', '', '', NULL),
 		('990', 'k', 'Call number prefix', 'Call number prefix', 0, 0, 'biblioitems.cn_prefix', 9, '', '', '', NULL, 0, '', '', '', NULL),
@@ -1467,4 +1467,4 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 
 
 UPDATE `marc_subfield_structure` SET maxlength=24 WHERE tagfield='000';
-UPDATE `marc_subfield_structure` SET maxlength=36 WHERE tagfield='100';
\ No newline at end of file
+UPDATE `marc_subfield_structure` SET maxlength=36 WHERE tagfield='100';
diff --git a/installer/data/mysql/ru-RU/marcflavour/marc21/mandatory/marc21_bibliographic_DEFAULT_local.sql b/installer/data/mysql/ru-RU/marcflavour/marc21/mandatory/marc21_bibliographic_DEFAULT_local.sql
index 7ef66e5..7e24eb0 100644
--- a/installer/data/mysql/ru-RU/marcflavour/marc21/mandatory/marc21_bibliographic_DEFAULT_local.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/marc21/mandatory/marc21_bibliographic_DEFAULT_local.sql
@@ -522,7 +522,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('', '', '942', '6', 0, 0, 'Нормализованная классификация Коха для сортировки', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('', '', '942', 'a', 0, 0, 'Institution code (устаревшее)', '',        9, -5, '', '', '', NULL, '', '', NULL),
  ('', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',         9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',                9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',                9, 0, NULL, '', '', NULL, '', '', NULL),
  ('', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '',    9, 0, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('', '', '942', 'k', 0, 0, 'Префикс шифра хранения', '',               9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_AR_local.sql b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_AR_local.sql
index 8a518e7..87a9d5a 100644
--- a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_AR_local.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_AR_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('AR', '', '942', '6', 0, 0, 'Нормализованная классификация Коха для сортировки', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('AR', '', '942', 'a', 0, 0, 'Institution code (устаревшее)', '',      9, -5, '', '', '', NULL, '', '', NULL),
  ('AR', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',       9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('AR', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('AR', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, NULL, '', '', NULL, '', '', NULL),
  ('AR', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('AR', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '',  9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('AR', '', '942', 'k', 0, 0, 'Префикс шифра хранения', '',             9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_BKS_local.sql b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_BKS_local.sql
index f2e78c8..066c9ec 100644
--- a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_BKS_local.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_BKS_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('BKS', '', '942', '6', 0, 0, 'Нормализованная классификация Коха для сортировки', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('BKS', '', '942', 'a', 0, 0, 'Institution code (устаревшее)', '',     9, -5, '', '', '', NULL, '', '', NULL),
  ('BKS', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',      9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('BKS', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',             9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('BKS', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',             9, 0, NULL, '', '', NULL, '', '', NULL),
  ('BKS', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('BKS', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('BKS', '', '942', 'k', 0, 0, 'Префикс шифра хранения', '',            9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_CF_local.sql b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_CF_local.sql
index 0c9a53b..50590c0 100644
--- a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_CF_local.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_CF_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('CF', '', '942', '6', 0, 0, 'Нормализованная классификация Коха для сортировки', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('CF', '', '942', 'a', 0, 0, 'Institution code (устаревшее)', '',      9, -5, '', '', '', NULL, '', '', NULL),
  ('CF', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',       9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('CF', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('CF', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, NULL, '', '', NULL, '', '', NULL),
  ('CF', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('CF', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '',  9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('CF', '', '942', 'k', 0, 0, 'Префикс шифра хранения', '',             9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_IR_local.sql b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_IR_local.sql
index 8b8e28f..d088a22 100644
--- a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_IR_local.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_IR_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('IR', '', '942', '6', 0, 0, 'Нормализованная классификация Коха для сортировки', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('IR', '', '942', 'a', 0, 0, 'Institution code (устаревшее)', '',      9, -5, '', '', '', NULL, '', '', NULL),
  ('IR', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',       9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('IR', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('IR', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, NULL, '', '', NULL, '', '', NULL),
  ('IR', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('IR', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '',  9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('IR', '', '942', 'k', 0, 0, 'Префикс шифра хранения', '',             9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_KT_local.sql b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_KT_local.sql
index 242939c..4c95cea 100644
--- a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_KT_local.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_KT_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('KT', '', '942', '6', 0, 0, 'Нормализованная классификация Коха для сортировки', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('KT', '', '942', 'a', 0, 0, 'Institution code (устаревшее)', '',      9, -5, '', '', '', NULL, '', '', NULL),
  ('KT', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',       9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('KT', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('KT', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, NULL, '', '', NULL, '', '', NULL),
  ('KT', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('KT', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '',  9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('KT', '', '942', 'k', 0, 0, 'Префикс шифра хранения', '',             9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_SER_local.sql b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_SER_local.sql
index fce988a..18daf8b 100644
--- a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_SER_local.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_SER_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('SER', '', '942', '6', 0, 0, 'Нормализованная классификация Коха для сортировки', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('SER', '', '942', 'a', 0, 0, 'Institution code (устаревшее)', '',     9, -5, '', '', '', NULL, '', '', NULL),
  ('SER', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',      9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('SER', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',             9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('SER', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',             9, 0, NULL, '', '', NULL, '', '', NULL),
  ('SER', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('SER', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('SER', '', '942', 'k', 0, 0, 'Префикс шифра хранения', '',            9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_SR_local.sql b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_SR_local.sql
index 5d37a17..e7e1c5d 100644
--- a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_SR_local.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_SR_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('SR', '', '942', '6', 0, 0, 'Нормализованная классификация Коха для сортировки', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('SR', '', '942', 'a', 0, 0, 'Institution code (устаревшее)', '',      9, -5, '', '', '', NULL, '', '', NULL),
  ('SR', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',       9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('SR', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('SR', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, NULL, '', '', NULL, '', '', NULL),
  ('SR', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('SR', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '',  9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('SR', '', '942', 'k', 0, 0, 'Префикс шифра хранения', '',             9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_VR_local.sql b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_VR_local.sql
index 395e1de..40ea887 100644
--- a/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_VR_local.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/marc21/optional/marc21_bibliographic_VR_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('VR', '', '942', '6', 0, 0, 'Нормализованная классификация Коха для сортировки', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('VR', '', '942', 'a', 0, 0, 'Institution code (устаревшее)', '',      9, -5, '', '', '', NULL, '', '', NULL),
  ('VR', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',       9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('VR', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('VR', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',              9, 0, NULL, '', '', NULL, '', '', NULL),
  ('VR', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('VR', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '',  9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('VR', '', '942', 'k', 0, 0, 'Префикс шифра хранения', '',             9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/ru-RU/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql b/installer/data/mysql/ru-RU/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql
index 3339d40..2f39c57 100644
--- a/installer/data/mysql/ru-RU/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql
@@ -239,8 +239,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('', '', '942', 't', 0, 0, 'Номер комплекта/экземпляра', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('', '', '942', 'v', 0, 0, 'Авторский (кеттеровский) знак, даты или срок, которые прилагаются к классификационному индексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('', '', '942', 'z', 0, 0, 'Внутренний № биб-записи в старой системе', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsolete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('', '', '942', 'e', 0, 0, 'Издание /часть шифра/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('', '', '942', 'e', 0, 0, 'Издание /часть шифра/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('', '', '942', 'k', 0, 0, 'Префикс шифра хранения (?)', '',           9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутренний № биб-экземп-записи  (biblioitems.biblioitemnumber)
diff --git a/installer/data/mysql/ru-RU/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql b/installer/data/mysql/ru-RU/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql
index 8676f7a..bb0d9bc 100644
--- a/installer/data/mysql/ru-RU/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql
+++ b/installer/data/mysql/ru-RU/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql
@@ -81,7 +81,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('', '', '942', 'a', 0, 0, 'Тип единицы [ЗАСТАРІЛЕ]', '',              9, -5, '', '', '', 0, '', '', NULL),
  ('', '', '942', 'b', 0, 0, 'Код структуры записи Коха', '',            9, -5, 'biblio.frameworkcode', '', '', 0, '', '', NULL),
  ('', '', '942', 'c', 1, 0, 'Тип единицы (уровень записи)', '',         9, 0, 'biblioitems.itemtype', 'itemtypes', '', 0, '', '', NULL),
- ('', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',                9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('', '', '942', 'e', 0, 0, 'Издание /часть шифра/', '',                9, 0, NULL, '', '', 0, '', '', NULL),
  ('', '', '942', 'h', 0, 0, 'Классификационная часть шифра хранения', '', 9, 0, 'biblioitems.cn_class', '', '', 0, '', '', NULL),
  ('', '', '942', 'i', 0, 1, 'Экземплярная часть шифра хранения', '',    9, 9, 'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('', '', '942', 'j', 0, 0, 'Шифр хранения (полностью)', 'Шифр заказа', 9, -5, '', '', '', 0, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/marc21/mandatory/marc21_bibliographic_DEFAULT_local.sql b/installer/data/mysql/uk-UA/marcflavour/marc21/mandatory/marc21_bibliographic_DEFAULT_local.sql
index ba5d4e7..1fe3910 100644
--- a/installer/data/mysql/uk-UA/marcflavour/marc21/mandatory/marc21_bibliographic_DEFAULT_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/marc21/mandatory/marc21_bibliographic_DEFAULT_local.sql
@@ -522,7 +522,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('', '', '942', '6', 0, 0, 'Нормалізована класифікація Коха для сортування', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('', '', '942', 'a', 0, 0, 'Institution code (застаріло)', '',         9, -5, '', '', '', NULL, '', '', NULL),
  ('', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',          9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',              9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',              9, 0, NULL, '', '', NULL, '', '', NULL),
  ('', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 0, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('', '', '942', 'k', 0, 0, 'Префікс шифру зберігання', '',             9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_AR_local.sql b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_AR_local.sql
index a461abf..3881c1e 100644
--- a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_AR_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_AR_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('AR', '', '942', '6', 0, 0, 'Нормалізована класифікація Коха для сортування', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('AR', '', '942', 'a', 0, 0, 'Institution code (застаріло)', '',       9, -5, '', '', '', NULL, '', '', NULL),
  ('AR', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',        9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('AR', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('AR', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, NULL, '', '', NULL, '', '', NULL),
  ('AR', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('AR', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('AR', '', '942', 'k', 0, 0, 'Префікс шифру зберігання', '',           9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_BKS_local.sql b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_BKS_local.sql
index 88274b4..dd33136 100644
--- a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_BKS_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_BKS_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('BKS', '', '942', '6', 0, 0, 'Нормалізована класифікація Коха для сортування', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('BKS', '', '942', 'a', 0, 0, 'Institution code (застаріло)', '',      9, -5, '', '', '', NULL, '', '', NULL),
  ('BKS', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',       9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('BKS', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',           9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('BKS', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',           9, 0, NULL, '', '', NULL, '', '', NULL),
  ('BKS', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('BKS', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('BKS', '', '942', 'k', 0, 0, 'Префікс шифру зберігання', '',          9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_CF_local.sql b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_CF_local.sql
index d55fcbb..efd83ec 100644
--- a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_CF_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_CF_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('CF', '', '942', '6', 0, 0, 'Нормалізована класифікація Коха для сортування', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('CF', '', '942', 'a', 0, 0, 'Institution code (застаріло)', '',       9, -5, '', '', '', NULL, '', '', NULL),
  ('CF', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',        9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('CF', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('CF', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, NULL, '', '', NULL, '', '', NULL),
  ('CF', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('CF', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('CF', '', '942', 'k', 0, 0, 'Префікс шифру зберігання', '',           9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_IR_local.sql b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_IR_local.sql
index 240efd8..164efc7 100644
--- a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_IR_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_IR_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('IR', '', '942', '6', 0, 0, 'Нормалізована класифікація Коха для сортування', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('IR', '', '942', 'a', 0, 0, 'Institution code (застаріло)', '',       9, -5, '', '', '', NULL, '', '', NULL),
  ('IR', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',        9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('IR', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('IR', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, NULL, '', '', NULL, '', '', NULL),
  ('IR', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('IR', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('IR', '', '942', 'k', 0, 0, 'Префікс шифру зберігання', '',           9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_KT_local.sql b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_KT_local.sql
index 7f5ea90..93e5177 100644
--- a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_KT_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_KT_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('KT', '', '942', '6', 0, 0, 'Нормалізована класифікація Коха для сортування', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('KT', '', '942', 'a', 0, 0, 'Institution code (застаріло)', '',       9, -5, '', '', '', NULL, '', '', NULL),
  ('KT', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',        9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('KT', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('KT', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, NULL, '', '', NULL, '', '', NULL),
  ('KT', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('KT', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('KT', '', '942', 'k', 0, 0, 'Префікс шифру зберігання', '',           9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_SER_local.sql b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_SER_local.sql
index f19f0b3..494a47a 100644
--- a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_SER_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_SER_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('SER', '', '942', '6', 0, 0, 'Нормалізована класифікація Коха для сортування', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('SER', '', '942', 'a', 0, 0, 'Institution code (застаріло)', '',      9, -5, '', '', '', NULL, '', '', NULL),
  ('SER', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',       9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('SER', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',           9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('SER', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',           9, 0, NULL, '', '', NULL, '', '', NULL),
  ('SER', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('SER', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('SER', '', '942', 'k', 0, 0, 'Префікс шифру зберігання', '',          9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_SR_local.sql b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_SR_local.sql
index 04f00c4..804b021 100644
--- a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_SR_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_SR_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('SR', '', '942', '6', 0, 0, 'Нормалізована класифікація Коха для сортування', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('SR', '', '942', 'a', 0, 0, 'Institution code (застаріло)', '',       9, -5, '', '', '', NULL, '', '', NULL),
  ('SR', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',        9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('SR', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('SR', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, NULL, '', '', NULL, '', '', NULL),
  ('SR', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('SR', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('SR', '', '942', 'k', 0, 0, 'Префікс шифру зберігання', '',           9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_VR_local.sql b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_VR_local.sql
index 210280f..bc6e3ed 100644
--- a/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_VR_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/marc21/optional/marc21_bibliographic_VR_local.sql
@@ -498,7 +498,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('VR', '', '942', '6', 0, 0, 'Нормалізована класифікація Коха для сортування', '', -1, 7, 'biblioitems.cn_sort', '', '', 0, '', '', NULL),
  ('VR', '', '942', 'a', 0, 0, 'Institution code (застаріло)', '',       9, -5, '', '', '', NULL, '', '', NULL),
  ('VR', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',        9, 0, 'biblioitems.itemtype', 'itemtypes', '', NULL, '', '', NULL),
- ('VR', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', NULL, '', '', NULL),
+ ('VR', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',            9, 0, NULL, '', '', NULL, '', '', NULL),
  ('VR', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження', '', 9, 0, 'biblioitems.cn_class', '', '', NULL, '', '', NULL),
  ('VR', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 9, 'biblioitems.cn_item', '', '', NULL, '', '', NULL),
  ('VR', '', '942', 'k', 0, 0, 'Префікс шифру зберігання', '',           9, 0, 'biblioitems.cn_prefix', '', '', NULL, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql
index 6cacf13..eed5b69 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql
@@ -209,8 +209,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('', '', '942', 't', 0, 0, 'Номер комплекту/примірника', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('', '', '942', 'v', 0, 0, 'Авторський (кеттерівський) знак, дати чи термін, що додаються до класифікаційного індексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('', '', '942', 'z', 0, 0, 'Внутрішній № біб-запису в старій системі', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsolete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('', '', '942', 'k', 0, 0, 'Префікс шифру зберігання (?)', '',          9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутрішній № біб-прим-запису (biblioitems.biblioitemnumber)
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_AN_local.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_AN_local.sql
index bb43e48..3b688b2 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_AN_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_AN_local.sql
@@ -209,8 +209,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('AN', '', '942', 't', 0, 0, 'Номер комплекту/примірника', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('AN', '', '942', 'v', 0, 0, 'Авторський (кеттерівський) знак, дати чи термін, що додаються до класифікаційного індексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('AN', '', '942', 'z', 0, 0, 'Внутрішній № біб-запису в старій системі', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsoete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('AN', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('AN', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('AN', '', '942', 'k', 0, 0, 'Префікс шифру зберігання (?)', '',          9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутрішній № біб-прим-запису (biblioitems.biblioitemnumber)
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_AUD_local.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_AUD_local.sql
index 86521fe..e488812 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_AUD_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_AUD_local.sql
@@ -209,8 +209,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('AUD', '', '942', 't', 0, 0, 'Номер комплекту/примірника', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('AUD', '', '942', 'v', 0, 0, 'Авторський (кеттерівський) знак, дати чи термін, що додаються до класифікаційного індексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('AUD', '', '942', 'z', 0, 0, 'Внутрішній № біб-запису в старій системі', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsoete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('AUD', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('AUD', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('AUD', '', '942', 'k', 0, 0, 'Префікс шифру зберігання (?)', '',          9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутрішній № біб-прим-запису (biblioitems.biblioitemnumber)
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_BOOK_local.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_BOOK_local.sql
index 8d87c59..961bcdd 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_BOOK_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_BOOK_local.sql
@@ -209,8 +209,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('BOOK', '', '942', 't', 0, 0, 'Номер комплекту/примірника', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('BOOK', '', '942', 'v', 0, 0, 'Авторський (кеттерівський) знак, дати чи термін, що додаються до класифікаційного індексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('BOOK', '', '942', 'z', 0, 0, 'Внутрішній № біб-запису в старій системі', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsoete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('BOOK', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('BOOK', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('BOOK', '', '942', 'k', 0, 0, 'Префікс шифру зберігання (?)', '',          9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутрішній № біб-прим-запису (biblioitems.biblioitemnumber)
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql
index 2a1e13a..295c0bc 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql
@@ -86,7 +86,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('', '', '942', 'a', 0, 0, 'Тип одиниці [ЗАСТАРІЛЕ]', '',               9, -5,'', '', '', 0, '', '', NULL),
  ('', '', '942', 'b', 0, 0, 'Код структури запису Коха', '',             9, -5,'biblio.frameworkcode', '', '', 0, '', '', NULL),
  ('', '', '942', 'c', 1, 0, 'Тип одиниці (рівень запису)', '',           9, 0, 'biblioitems.itemtype', 'itemtypes', '', 0, '', '', NULL),
- ('', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',               9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('', '', '942', 'e', 0, 0, 'Видання /частина шифру/', '',               9, 0, NULL, '', '', 0, '', '', NULL),
  ('', '', '942', 'h', 0, 0, 'Класифікаційна частина шифру збереження','',9, 0, 'biblioitems.cn_class', '', '', 0, '', '', NULL),
  ('', '', '942', 'i', 0, 1, 'Примірникова частина шифру збереження', '', 9, 9, 'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('', '', '942', 'j', 0, 0, 'Шифр зберігання (повністю)','Шифр замовлення',9,-5,'', '', '', 0, '', '', NULL),
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_EL_local.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_EL_local.sql
index 6dcd3fd..57a02c3 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_EL_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_EL_local.sql
@@ -209,8 +209,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('EL', '', '942', 't', 0, 0, 'Номер комплекту/примірника', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('EL', '', '942', 'v', 0, 0, 'Авторський (кеттерівський) знак, дати чи термін, що додаються до класифікаційного індексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('EL', '', '942', 'z', 0, 0, 'Внутрішній № біб-запису в старій системі', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsoete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('EL', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('EL', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('EL', '', '942', 'k', 0, 0, 'Префікс шифру зберігання (?)', '',          9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутрішній № біб-прим-запису (biblioitems.biblioitemnumber)
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_MIN_local.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_MIN_local.sql
index 9067e58..c183f91 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_MIN_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_MIN_local.sql
@@ -209,8 +209,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('MIN', '', '942', 't', 0, 0, 'Номер комплекту/примірника', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('MIN', '', '942', 'v', 0, 0, 'Авторський (кеттерівський) знак, дати чи термін, що додаються до класифікаційного індексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('MIN', '', '942', 'z', 0, 0, 'Внутрішній № біб-запису в старій системі', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsoete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('MIN', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('MIN', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('MIN', '', '942', 'k', 0, 0, 'Префікс шифру зберігання (?)', '',          9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутрішній № біб-прим-запису (biblioitems.biblioitemnumber)
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_NOTE_local.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_NOTE_local.sql
index 0c864e0..cdfe6d0 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_NOTE_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_NOTE_local.sql
@@ -209,8 +209,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('NOTE', '', '942', 't', 0, 0, 'Номер комплекту/примірника', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('NOTE', '', '942', 'v', 0, 0, 'Авторський (кеттерівський) знак, дати чи термін, що додаються до класифікаційного індексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('NOTE', '', '942', 'z', 0, 0, 'Внутрішній № біб-запису в старій системі', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsoete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('NOTE', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('NOTE', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('NOTE', '', '942', 'k', 0, 0, 'Префікс шифру зберігання (?)', '',          9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутрішній № біб-прим-запису (biblioitems.biblioitemnumber)
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_PER_local.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_PER_local.sql
index 9ac3a72..9d3eab8 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_PER_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_PER_local.sql
@@ -209,8 +209,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('PER', '', '942', 't', 0, 0, 'Номер комплекту/примірника', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('PER', '', '942', 'v', 0, 0, 'Авторський (кеттерівський) знак, дати чи термін, що додаються до класифікаційного індексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('PER', '', '942', 'z', 0, 0, 'Внутрішній № біб-запису в старій системі', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsoete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('PER', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('PER', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('PER', '', '942', 'k', 0, 0, 'Префікс шифру зберігання (?)', '',          9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутрішній № біб-прим-запису (biblioitems.biblioitemnumber)
diff --git a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_TECH_local.sql b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_TECH_local.sql
index 5899b28..0729296 100644
--- a/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_TECH_local.sql
+++ b/installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_TECH_local.sql
@@ -209,8 +209,7 @@ INSERT INTO  marc_subfield_structure (frameworkcode, authtypecode, tagfield, tag
  ('TECH', '', '942', 't', 0, 0, 'Номер комплекту/примірника', '',            9, -5,'biblioitems.cn_item', '', '', 0, '', '', NULL),
  ('TECH', '', '942', 'v', 0, 0, 'Авторський (кеттерівський) знак, дати чи термін, що додаються до класифікаційного індексу', '', 9, -5, '', '', '', 0, '', '', NULL),
  ('TECH', '', '942', 'z', 0, 0, 'Внутрішній № біб-запису в старій системі', '',9,4, '', '', '', 0, '', '', NULL);
-# next 2 is obsoete (not found biblioitems.cn_edition, biblioitems.cn_prefix, CN_EDITION)
-#  ('TECH', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, 'biblioitems.cn_edition', 'CN_EDITION', '', 0, '', '', NULL),
+ ('TECH', '', '942', 'e', 0, 0, 'Видання /частина шифру/ (?)', '',            9, 0, NULL, '', '', 0, '', '', NULL),
 #  ('TECH', '', '942', 'k', 0, 0, 'Префікс шифру зберігання (?)', '',          9, 0, 'biblioitems.cn_prefix', '', '', 0, '', '', NULL),
 #****************** biblioitems.COLUMNS and it connect to 942,090
 # biblioitemnumber			090^a		Внутрішній № біб-прим-запису (biblioitems.biblioitemnumber)
-- 
1.7.2.5