diff --git a/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php b/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php
index aaf85c52..a39d65ad 100644
--- a/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php
+++ b/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php
@@ -416,44 +416,74 @@
         // });
 
 
-        $('#field-select-category').on('change', function () {
-
-    // Only remove category hidden field
-    $('#report-form input.category-hidden').remove();
-
-    let slug = $(this).val()
-        .toLowerCase()
-        .trim()
-        .replace(/[^a-z0-9\s-]/g, '')
-        .replace(/\s+/g, '_')
-        .replace(/-+/g, '_');
-
-    $('#report-form').append(
-        '<input type="hidden" class="category-hidden" name="' + slug + '" value="1">'
-    );
-});
 
 
-$('#field-converted').on('change', function () {
+function appendConvertedField() {
 
-    let value = $(this).val();
-
-    // Only remove converted hidden field
+    // remove old hidden fields
     $('#report-form input.converted-hidden').remove();
 
-    let slug = value
-        .toLowerCase()
-        .trim()
-        .replace(/[^a-z0-9\s-]/g, '')
-        .replace(/\s+/g, '_')
-        .replace(/-+/g, '_');
+    let convertedValue = $('#field-converted').val();
 
-    if (value === 'Yes') {
-        $('#report-form').append(
-            '<input type="hidden" class="converted-hidden" name="' + slug + '" value="1">'
-        );
+    let selectedCategory = $('#field-select-category').val();
+
+    if(!convertedValue || !selectedCategory){
+        return;
     }
-});
+
+    // category mapping
+    let categoryMap = {
+
+        "foracort-ciphaler": "foracort_ciphaler",
+        "duolin-synchrobreathe": "duolin_synchrobreathe",
+        "foracort-g": "foracort_g",
+        "pedia": "pedia",
+        "triple-combination-voltido-trio-indaflo-g": "triple_combination_voltido_trio_indaflo_g",
+        "ics-laba-seroflo-maxiflo-voltido": "ics_laba_seroflo_maxiflo_voltido",
+        "competition-dr": "competition_dr"
+
+    };
+
+    let categoryKey = categoryMap[selectedCategory];
+
+    if(!categoryKey){
+        return;
+    }
+
+    // category data
+    let categoryValue = (convertedValue === 'Yes') ? '1' : '0';
+
+    // append original category field
+    $('#report-form').append(
+        '<input type="hidden" class="converted-hidden" name="' + categoryKey + '" value="' + categoryValue + '">'
+    );
+
+    // extra metric fields
+    if(convertedValue === 'Yes'){
+
+        $('#report-form').append(
+            '<input type="hidden" class="converted-hidden" name="conversion_yes" value="1">'
+        );
+
+    }
+
+    if(convertedValue === 'No'){
+
+        $('#report-form').append(
+            '<input type="hidden" class="converted-hidden" name="conversion_no" value="1">'
+        );
+
+    }
+
+    console.log("Category:", categoryKey, categoryValue);
+
+}
+
+$('#field-converted').on('change', appendConvertedField);
+
+$('#field-select-category').on('change', appendConvertedField);
+
+
 
 function toggleUploadFields() {