diff --git a/admin/searchengine/elasticsearch/mappings.yaml b/admin/searchengine/elasticsearch/mappings.yaml
index 4ade2baa95..056aee4265 100644
--- a/admin/searchengine/elasticsearch/mappings.yaml
+++ b/admin/searchengine/elasticsearch/mappings.yaml
@@ -1670,7 +1670,7 @@ biblios:
     label: index-term-genre
     mappings:
       - facet: ''
-        marc_field: 655a
+        marc_field: 655avxyz
         marc_type: marc21
         sort: ~
         suggestible: ''
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 c405228d45..1c1daa26cf 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
@@ -789,7 +789,7 @@
     <target_index>Subject:p</target_index>
   </index_data_field>
   <!--melm 655$a      Index-term-genre    -->
-  <index_subfields tag="655" subfields="a">
+  <index_subfields tag="655" subfields="axvyz">
     <target_index>Index-term-genre:w</target_index>
     <target_index>Index-term-genre:p</target_index>
     <target_index>Subject:w</target_index>
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 0b689ca6e2..aa0fe9a9ee 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
@@ -722,7 +722,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='655']">
     <xslo:for-each select="marc:subfield">
-      <xslo:if test="contains('a', @code)">
+      <xslo:if test="contains('axvyz', @code)">
         <z:index name="Index-term-genre:w Index-term-genre:p Subject:w Subject:p">
           <xslo:value-of select="."/>
         </z:index>