diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
index e1941793c9..c8bd60eaa4 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
@@ -297,6 +297,7 @@
     <target_index>Name:w</target_index>
     <target_index>Name-and-title:w</target_index>
     <target_index>Corporate-name:w</target_index>
+    <target_index>Corporate-name:p</target_index>
   </index_data_field>
   <!--record.abs line 95: melm 111$9      Koha-Auth-Number-->
   <index_subfields tag="111" subfields="9">
@@ -515,6 +516,7 @@
   <index_data_field tag="410">
     <target_index>Author:w</target_index>
     <target_index>Corporate-name:w</target_index>
+    <target_index>Corporate-name:p</target_index>
   </index_data_field>
   <!--record.abs line 133: melm 411$a      Name-and-title-->
   <index_subfields tag="411" subfields="a">
@@ -679,6 +681,7 @@
     <target_index>Subject:w</target_index>
     <target_index>Subject:p</target_index>
     <target_index>Corporate-name:w</target_index>
+    <target_index>Corporate-name:p</target_index>
   </index_data_field>
   <!--record.abs line 169: melm 611$a      Name-and-title,Subject,Subject:p-->
   <index_subfields tag="611" subfields="a">
@@ -917,6 +920,7 @@
     <target_index>Author:w</target_index>
     <target_index>Author:p</target_index>
     <target_index>Corporate-name:w</target_index>
+    <target_index>Corporate-name:p</target_index>
     <target_index>Name:w</target_index>
   </index_data_field>
   <!--record.abs line 213: melm 711$a      Name-and-title-->
@@ -1114,6 +1118,7 @@
   <index_data_field tag="810">
     <target_index>Author:w</target_index>
     <target_index>Corporate-name:w</target_index>
+    <target_index>Corporate-name:p</target_index>
     <target_index>Author-name-corporate:w</target_index>
     <target_index>Name:w</target_index>
   </index_data_field>
diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
index 8e5514af72..72bc7f0b09 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
@@ -1910,7 +1910,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
     </z:index>
   </xslo:template>
   <xslo:template mode="index_data_field" match="marc:datafield[@tag='110']">
-    <z:index name="Author:w Author:p Author:s Author-title:w Author-name-corporate:w Name:w Name-and-title:w Corporate-name:w">
+    <z:index name="Author:w Author:p Author:s Author-title:w Author-name-corporate:w Name:w Name-and-title:w Corporate-name:w Corporate-name:p">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
           <xslo:if test="position() &gt; 1">
@@ -2131,7 +2131,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
     </z:index>
   </xslo:template>
   <xslo:template mode="index_data_field" match="marc:datafield[@tag='410']">
-    <z:index name="Author:w Corporate-name:w">
+    <z:index name="Author:w Corporate-name:w Corporate-name:p">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
           <xslo:if test="position() &gt; 1">
@@ -2274,7 +2274,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
     </z:index>
   </xslo:template>
   <xslo:template mode="index_data_field" match="marc:datafield[@tag='610']">
-    <z:index name="Name:w Subject:w Subject:p Corporate-name:w">
+    <z:index name="Name:w Subject:w Subject:p Corporate-name:w Corporate-name:p">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
           <xslo:if test="position() &gt; 1">
@@ -2443,7 +2443,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
     </z:index>
   </xslo:template>
   <xslo:template mode="index_data_field" match="marc:datafield[@tag='710']">
-    <z:index name="Author:w Author:p Corporate-name:w Name:w">
+    <z:index name="Author:w Author:p Corporate-name:w Corporate-name:p Name:w">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
           <xslo:if test="position() &gt; 1">
@@ -2547,7 +2547,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
     </z:index>
   </xslo:template>
   <xslo:template mode="index_data_field" match="marc:datafield[@tag='810']">
-    <z:index name="Author:w Corporate-name:w Author-name-corporate:w Name:w">
+    <z:index name="Author:w Corporate-name:w Corporate-name:p Author-name-corporate:w Name:w">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
           <xslo:if test="position() &gt; 1">