diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js b/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js
index c02e700db2..89e8e9780d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js
@@ -168,7 +168,7 @@ function changeH4Result(form, h4_result, tr_result, pos, value)
 (function()
 {
 
-    xmlControlField = function(tagfield, form_id, select, table, h4_result, tr_result, idMaterial, themelang)
+    xmlControlField = function(tagfield, form_id, select, table, h4_result, tr_result, idMaterial, themelang, marcflavour)
     {
         this.tagfield = tagfield;
         this.idMaterial = idMaterial;
@@ -179,6 +179,7 @@ function changeH4Result(form, h4_result, tr_result, pos, value)
         this.h4_result = h4_result;
         this.tr_result = tr_result;
         this.themelang = themelang;
+        this.marcflavour = marcflavour.toLowerCase();
     };//xmlControlField
 
 
@@ -205,7 +206,7 @@ function changeH4Result(form, h4_result, tr_result, pos, value)
         {
             this.xmlDoc = $.ajax({
                 type: "GET",
-                url: this.themelang + "/data/marc21_field_" + this.tagfield + ".xml",
+                url: this.themelang + "/data/" + this.marcflavour + "_field_" + this.tagfield + ".xml",
                 dataType: "xml",
                 async: false
             }).responseXML;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt
index 2824577541..4a2263aedb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt
@@ -16,7 +16,7 @@
         var form = document.f_pop;
         h4_result = document.getElementById("h4_result");
         tr_result = document.getElementById("tr_result");
-        objXmlControlField = new xmlControlField('[% tagfield %]', 'f_pop', document.getElementById('material_type'), document.getElementById('table_material_types'), 'h4_result', 'tr_result', '', '[% themelang %]');
+        objXmlControlField = new xmlControlField('[% tagfield %]', 'f_pop', document.getElementById('material_type'), document.getElementById('table_material_types'), 'h4_result', 'tr_result', '', '[% themelang %]', '[% marcflavour %]');
         objXmlControlField.loadXmlValues();
         renderResult(tr_result, (form.result.value != "")?form.result.value:returnValueParam("result"));
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
index b2929913bb..6e5acb9a72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
@@ -16,7 +16,7 @@
         var form = document.f_pop;
         h4_result = document.getElementById("h4_result");
         tr_result = document.getElementById("tr_result");
-        objXmlControlField = new xmlControlField('[% tagfield %]', 'f_pop', document.getElementById('material_type'), document.getElementById('table_material_types'), 'h4_result', 'tr_result', '', '[% themelang %]');
+        objXmlControlField = new xmlControlField('[% tagfield %]', 'f_pop', document.getElementById('material_type'), document.getElementById('table_material_types'), 'h4_result', 'tr_result', '', '[% themelang %]', '[% marcflavour %]');
         objXmlControlField.loadXmlValues();
         renderResult(tr_result, (form.result.value != "")?form.result.value:returnValueParam("result"));
         [% END %]