diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGEL.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGEL.java
index 960ed67a..f39cb0e8 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGEL.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGEL.java
@@ -32,7 +32,11 @@ private void initialize() {
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
     ind1 = new Indicator();
-    ind2 = new Indicator();
+    ind2 = new Indicator("Nichtsortierende Zeichen")
+    .setCodes(
+      "0", "Keine nichtsortierenden Zeichen"
+    )
+    .setMqTag("nichtsortierendeZeichen");
 
     setSubfieldsWithCardinality(
       "a", "Titel eines Werkes", "NR",
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGKS.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGKS.java
index bcd7b22f..668f875e 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGKS.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGKS.java
@@ -31,7 +31,12 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
+    ind1 = new Indicator("Art des Veranstaltungsnamens als Eintragungselement")
+    .setCodes(
+      "2", "Name einer Veranstaltung"
+    )
+    .setMqTag("artDesVeranstaltungsnamensAlsEintragungselement");
+
     ind2 = new Indicator();
 
     setSubfieldsWithCardinality(
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGKT.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGKT.java
index 37ea839a..3e2f7456 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGKT.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGKT.java
@@ -31,7 +31,13 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
+    ind1 = new Indicator("Art Körperschaftsnamens")
+    .setCodes(
+      "1", "Name einer Gebietskörperschaft",
+      "2", "Name einer Körperschaft"
+    )
+    .setMqTag("artKoerperschaftsnamens");
+    
     ind2 = new Indicator();
 
     setSubfieldsWithCardinality(
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGPN.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGPN.java
index 6fc6ddd9..547ce987 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGPN.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGPN.java
@@ -31,7 +31,14 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
+    ind1 = new Indicator("Art der Eintragung des Personennamenelements")
+      .setCodes(
+        "0", "Vorname",
+        "1", "Nachname",
+        "3", "Familienname"
+      )
+      .setMqTag("artDerEintragungDesPersonennamenelements");
+
     ind2 = new Indicator();
 
     setSubfieldsWithCardinality(
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGSI.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGSI.java
index 910c36d6..705f3ef0 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGSI.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagGSI.java
@@ -31,7 +31,12 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
+    ind1 = new Indicator("Art der Standard-Nummer oder des Codes")
+    .setCodes(
+      "7", "Quelle näher beschrieben im Unterfeld $2",
+      "8", "Unspezifizierte Art der Standardnummer oder des Codes"
+    )
+    .setMqTag("artDerStandard-NummerOderDesCodes");
     ind2 = new Indicator();
 
     setSubfieldsWithCardinality(
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH16.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH16.java
index 9c1f4404..90b42599 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH16.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH16.java
@@ -30,7 +30,13 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
+    ind1 = new Indicator("National bibliographic agency")
+    .setCodes(
+      " ", "Library and Archives Canada",
+      "7", "Source specified in subfield $2"
+    )
+    .setMqTag("nationalBibliographicAgency");
+    
     ind2 = new Indicator();
 
     setSubfieldsWithCardinality(
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH24.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH24.java
index 4e9c674f..99d80d64 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH24.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH24.java
@@ -1,5 +1,7 @@
 package de.gwdg.metadataqa.marc.definition.tags.hbztags;
 
+import org.apache.hadoop.shaded.org.apache.commons.net.nntp.Article;
+
 import de.gwdg.metadataqa.marc.definition.Cardinality;
 import de.gwdg.metadataqa.marc.definition.structure.DataFieldDefinition;
 import de.gwdg.metadataqa.marc.definition.structure.Indicator;
@@ -30,8 +32,25 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
-    ind2 = new Indicator();
+    ind1 = new Indicator("Type of standard number or code")
+    .setCodes(
+      "0", "International Standard Recording Code",
+      "1", "Universal Product Code",
+      "2", "International Standard Music Number",
+      "3", "International Article Number",
+      "4", "Serial Item and Contribution Identifier",
+      "7", "Source specified in subfield $2",
+      "8", "Unspecified type of standard number or code"
+    )
+    .setMqTag("typeOfStandardNumberOrCode");
+
+    ind2 = new Indicator("Difference indicator")
+    .setCodes(
+      " ", "No information provided",
+      "0", "No difference",
+      "1", "Difference"
+    )
+    .setMqTag("differenceIndicator");
 
     setSubfieldsWithCardinality(
     "a", "Standard number or code", "NR",
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH52.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH52.java
index 9a075539..95e7feb1 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH52.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH52.java
@@ -30,8 +30,30 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
-    ind2 = new Indicator();
+    ind1 = new Indicator("Shelving scheme")
+    .setCodes(
+      " ", "No information provided",
+      "0", "Library of Congress classification",
+      "1", "Dewey Decimal classification",
+      "2", "National Library of Medicine classification",
+      "3", "Superintendent of Documents classification",
+      "4", "Shelving control number",
+      "5", "Title",
+      "6", "Shelved separately",
+      "7", "Source specified in subfield $2",
+      "8", "Other scheme"
+    )
+    .setMqTag("shelvingScheme");
+
+
+    ind2 = new Indicator("Shelving order")
+    .setCodes(
+      " ", "No information provided",
+      "0", "Not enumeration",
+      "1", "Primary enumeration",
+      "2", "Alternative enumeration"
+    )
+    .setMqTag("shelvingOrder");
 
     setSubfieldsWithCardinality(
 
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH56.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH56.java
index 79251f8e..df7e2bad 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH56.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH56.java
@@ -1,5 +1,7 @@
 package de.gwdg.metadataqa.marc.definition.tags.hbztags;
 
+import org.apache.hadoop.shaded.org.jline.builtins.telnet.Telnet;
+
 import de.gwdg.metadataqa.marc.definition.Cardinality;
 import de.gwdg.metadataqa.marc.definition.structure.DataFieldDefinition;
 import de.gwdg.metadataqa.marc.definition.structure.Indicator;
@@ -30,8 +32,30 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
-    ind2 = new Indicator();
+    ind1 = new Indicator("Access method")
+    .setCodes(
+      " ", "No information provided",
+      "0", "Email",
+      "1", "FTP",
+      "2", "Remote login (Telnet)",
+      "3", "Dial-up",
+      "4", "HTTP",
+      "7", "Method specified in subfield $2"
+    )
+    .setMqTag("accessMethod");
+
+
+    ind2 = new Indicator("Relationship")
+    .setCodes(
+      " ", "No information provided",
+      "0", "Resource",
+      "1", "Version of resource",
+      "2", "Related resource",
+      "3", "Component part(s) of resource",
+      "4", "Version of component part(s) of resource",
+      "8", "No display constant generated"
+    )
+    .setMqTag("relationship");
 
     setSubfieldsWithCardinality(
 
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH59.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH59.java
index b4ede8ec..7f24fddd 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH59.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH59.java
@@ -31,8 +31,20 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
-    ind2 = new Indicator();
+    ind1 = new Indicator("Gruppe")
+    .setCodes(
+      "0", "Beginngruppe",
+      "1", "Endgruppe"
+    )
+    .setMqTag("gruppe");
+
+
+    ind2 = new Indicator("Bestand")
+    .setCodes(
+      "0", "abgeschlossener Bestand",
+      "1", "laufender Bestand"
+    )
+    .setMqTag("bestand");
 
     setSubfieldsWithCardinality(
       "8", "Sortierhilfe", "NR",
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH69.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH69.java
index a1382438..27cf2f8a 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH69.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH69.java
@@ -31,8 +31,20 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
-    ind2 = new Indicator();
+    ind1 = new Indicator("Gruppe")
+    .setCodes(
+      "0", "Beginngruppe",
+      "1", "Endgruppe"
+    )
+    .setMqTag("gruppe");
+
+
+    ind2 = new Indicator("Status")
+    .setCodes(
+      "0", "abgeschlossen",
+      "1", "laufend"
+    )
+    .setMqTag("status");
 
     setSubfieldsWithCardinality(
       "8", "Sortierhilfe ", "NR",
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH83.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH83.java
index 49a6e3d0..470fcfad 100644
--- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH83.java
+++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/TagH83.java
@@ -30,7 +30,13 @@ private void initialize() {
     cardinality = Cardinality.Repeatable;
     descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=949911658";
 
-    ind1 = new Indicator();
+    ind1 = new Indicator("Privacy")
+    .setCodes(
+      " ", "No information provided",
+      "0", "Private",
+      "1", "Not Private"
+    )
+    .setMqTag("privacy");
     ind2 = new Indicator();
 
     setSubfieldsWithCardinality(