diff --git a/etc/searchengine/queryparser.yaml b/etc/searchengine/queryparser.yaml
index 717df1ea48..d9f637bfd3 100644
--- a/etc/searchengine/queryparser.yaml
+++ b/etc/searchengine/queryparser.yaml
@@ -1196,7 +1196,9 @@ field_mappings:
       label: ''
       aliases:
         - su
-    authority-number:
+        - su-to
+        - su-geo
+        - su-ut
     authority-number:
       bib1_mapping:
         biblioserver:
@@ -1268,6 +1270,16 @@ field_mappings:
       aliases:
         - matchheading
         - match-heading
+    name-personal:
+      bib1_mapping:
+        biblioserver:
+          1: 1009
+      enabled: 1
+      index: name-personal
+      label: Name-personal
+      aliases:
+        - name-personal
+        - su-na
     index-term-genre:
       bib1_mapping:
         biblioserver:
@@ -1309,97 +1321,6 @@ field_mappings:
       label: Start
       aliases:
         - start
-    subject-chronological:
-      bib1_mapping:
-        biblioserver:
-          1: 1077
-      enabled: 1
-      index: subject-chronological
-      label: Subject-chronological
-      aliases:
-        - subject-chronological
-        - su-chrono
-    subject-division:
-      bib1_mapping:
-        biblioserver:
-          1: 47
-      enabled: 1
-      index: subject-division
-      label: Subject-division
-      aliases:
-        - subject-division
-    subject-genre-form:
-      bib1_mapping:
-        biblioserver:
-          1: 1075
-      enabled: 1
-      index: subject-genre-form
-      label: Subject-genre-form
-      aliases:
-        - subject-genre-form
-        - su-genre
-        - su-form
-    subject-name-conference:
-      bib1_mapping:
-        biblioserver:
-          1: 1073
-      enabled: 1
-      index: subject-name-conference
-      label: Subject-name-conference
-      aliases:
-        - subject-name-conference
-        - su-conf
-    subject-name-corporate:
-      bib1_mapping:
-        biblioserver:
-          1: 1074
-      enabled: 1
-      index: subject-name-corporate
-      label: Subject-name-corporate
-      aliases:
-        - subject-name-corporate
-        - su-corp
-    subject-name-geographical:
-      bib1_mapping:
-        biblioserver:
-          1: 1076
-      enabled: 1
-      index: subject-name-geographical
-      label: Subject-name-geographical
-      aliases:
-        - subject-name-geographical
-        - su-geo
-    subject-name-personal:
-      bib1_mapping:
-        biblioserver:
-          1: 1009
-      enabled: 1
-      index: subject-name-personal
-      label: Subject-name-personal
-      aliases:
-        - subject-name-personal
-        - su-na
-    subject-title:
-      bib1_mapping:
-        biblioserver:
-          1: 1078
-      enabled: 1
-      index: subject-title
-      label: Subject-title
-      aliases:
-        - subject-title
-        - su-ti
-        - su-ut
-    subject-topical:
-      bib1_mapping:
-        biblioserver:
-          1: 1079
-      enabled: 1
-      index: subject-topical
-      label: Subject-topical
-      aliases:
-        - subject-topical
-        - su-to
   title:
     title:
       bib1_mapping:
diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index f0c09347bb..85611d3562 100644
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -739,10 +739,10 @@ Subject-genre-form 1=1075
 su-genre Subject-genre-form
 su-form Subject-genre-form
 
-#Subject-name-geographical 1076                            MARC21 651 ; UNIMARC 607
+#Subject-geographical 1076                                 MARC21 651 ; UNIMARC 607
 #                                                          MARC21 AND UNIMARC 6XX$y
-Subject-name-geographical 1=1076
-su-geo Subject-name-geographical
+Subject-geographical 1=1076
+su-geo Subject-geographical
 
 #Subject-chronological 1077                                MARC21 and UNIMARC 6XX$z
 Subject-chronological 1=1077
diff --git a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
index 55462c1e97..85f50f8626 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
@@ -1232,13 +1232,43 @@
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--660$9      Koha-Auth-Number,Koha-Auth-Number:n-->
-  <index_subfields tag="660" subfields="9">
+  <!--603$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+  <index_subfields tag="603" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--661$9      Koha-Auth-Number,Koha-Auth-Number:n-->
-  <index_subfields tag="661" subfields="9">
+  <!--630$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+  <index_subfields tag="630" subfields="9">
+    <target_index>Koha-Auth-Number:w</target_index>
+    <target_index>Koha-Auth-Number:n</target_index>
+  </index_subfields>
+  <!--631$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+  <index_subfields tag="631" subfields="9">
+    <target_index>Koha-Auth-Number:w</target_index>
+    <target_index>Koha-Auth-Number:n</target_index>
+  </index_subfields>
+  <!--632$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+  <index_subfields tag="632" subfields="9">
+    <target_index>Koha-Auth-Number:w</target_index>
+    <target_index>Koha-Auth-Number:n</target_index>
+  </index_subfields>
+  <!--633$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+  <index_subfields tag="633" subfields="9">
+    <target_index>Koha-Auth-Number:w</target_index>
+    <target_index>Koha-Auth-Number:n</target_index>
+  </index_subfields>
+  <!--634$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+  <index_subfields tag="634" subfields="9">
+    <target_index>Koha-Auth-Number:w</target_index>
+    <target_index>Koha-Auth-Number:n</target_index>
+  </index_subfields>
+  <!--635$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+  <index_subfields tag="635" subfields="9">
+    <target_index>Koha-Auth-Number:w</target_index>
+    <target_index>Koha-Auth-Number:n</target_index>
+  </index_subfields>
+  <!--636$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+  <index_subfields tag="636" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
diff --git a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
index 9de15be82a..ef2ff9e3d1 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
@@ -2138,7 +2138,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
       </xslo:if>
     </xslo:for-each>
   </xslo:template>
-  <xslo:template mode="index_subfields" match="marc:datafield[@tag='660']">
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='603']">
     <xslo:for-each select="marc:subfield">
       <xslo:if test="contains('9', @code)">
         <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
@@ -2146,6 +2146,71 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+  </xslo:template>
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='630']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('9', @code)">
+        <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='631']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('9', @code)">
+        <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='632']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('9', @code)">
+        <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='633']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('9', @code)">
+        <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='634']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('9', @code)">
+        <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='635']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('9', @code)">
+        <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='636']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('9', @code)">
+        <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='660']">
     <xslo:for-each select="marc:subfield">
       <xslo:if test="contains('a', @code)">
         <z:index name="Subject:w Subject:p">
@@ -2155,13 +2220,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
     </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='661']">
-    <xslo:for-each select="marc:subfield">
-      <xslo:if test="contains('9', @code)">
-        <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
-          <xslo:value-of select="."/>
-        </z:index>
-      </xslo:if>
-    </xslo:for-each>
     <xslo:for-each select="marc:subfield">
       <xslo:if test="contains('a', @code)">
         <z:index name="Subject:w Subject:p">