diff --git a/opensrp-chw/build.gradle b/opensrp-chw/build.gradle
index afe0148506..a081a6fd57 100644
--- a/opensrp-chw/build.gradle
+++ b/opensrp-chw/build.gradle
@@ -112,7 +112,7 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    implementation('org.smartregister:opensrp-client-native-form:1.6.1-RTL-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:1.6.3-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'
diff --git a/opensrp-chw/src/main/assets/json.form/birth_certification_fr.json b/opensrp-chw/src/main/assets/json.form/birth_certification_fr.json
index e7abfe2a52..1d3cbafa5b 100644
--- a/opensrp-chw/src/main/assets/json.form/birth_certification_fr.json
+++ b/opensrp-chw/src/main/assets/json.form/birth_certification_fr.json
@@ -61,6 +61,10 @@
           "Oui",
           "Non"
         ],
+        "keys": [
+          "Yes",
+          "No"
+        ],
         "openmrs_choice_ids": {
           "Oui": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
           "Non": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
@@ -124,6 +128,10 @@
           "Oui",
           "Non"
         ],
+        "keys": [
+          "Yes",
+          "No"
+        ],
         "openmrs_choice_ids": {
           "Oui": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
           "Non": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
diff --git a/opensrp-chw/src/main/assets/json.form/child_enrollment_fr.json b/opensrp-chw/src/main/assets/json.form/child_enrollment_fr.json
index 4d57ae51c1..2ddd6e0453 100644
--- a/opensrp-chw/src/main/assets/json.form/child_enrollment_fr.json
+++ b/opensrp-chw/src/main/assets/json.form/child_enrollment_fr.json
@@ -262,6 +262,10 @@
           "Mâle",
           "Femelle"
         ],
+        "keys": [
+          "Male",
+          "Female"
+        ],
         "v_required": {
           "value": "true",
           "err": "Veuillez entrer le sexe"
@@ -278,6 +282,10 @@
           "Oui",
           "Non"
         ],
+        "keys": [
+          "Yes",
+          "No"
+        ],
         "openmrs_choice_ids": {
           "Oui": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
           "Non": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
diff --git a/opensrp-chw/src/main/assets/json.form/family_details_register_fr.json b/opensrp-chw/src/main/assets/json.form/family_details_register_fr.json
index 22b7bff4f5..e3d992f0de 100644
--- a/opensrp-chw/src/main/assets/json.form/family_details_register_fr.json
+++ b/opensrp-chw/src/main/assets/json.form/family_details_register_fr.json
@@ -155,6 +155,19 @@
           "Communications, services sociaux et personnelles",
           "Autre"
         ],
+        "keys": [
+          "Petty trade",
+          "Agriculture, hunting and fishing",
+          "Exploitation of mines and quarries",
+          "Manufacturing industry",
+          "Construction",
+          "Electricity, gas and water",
+          "Commercial, hotels and restaurants",
+          "Transport, storage and communications",
+          "Financial institutions",
+          "Communication, social and personal services",
+          "Other"
+        ],
         "openmrs_choice_ids": {
           "Petit commerce": "1539AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
           "Agriculture, chasse et pêche": "165411AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
diff --git a/opensrp-chw/src/main/assets/json.form/family_details_remove_child_fr.json b/opensrp-chw/src/main/assets/json.form/family_details_remove_child_fr.json
index de7f83ed0e..603c75bc89 100644
--- a/opensrp-chw/src/main/assets/json.form/family_details_remove_child_fr.json
+++ b/opensrp-chw/src/main/assets/json.form/family_details_remove_child_fr.json
@@ -99,6 +99,11 @@
           "Déménagé",
           "Autre"
         ],
+        "keys": [
+          "Died",
+          "Moved away",
+          "Other"
+        ],
         "v_required": {
           "value": "true",
           "err": "Sélectionnez la raison pour déplacer le dossier de l'enfant."
@@ -145,7 +150,7 @@
         "relevance": {
           "step1:remove_reason": {
             "type": "string",
-            "ex": "equalTo(., \"Moved away\")"
+            "ex": "equalTo(., \"Déménagé\")"
           }
         }
       },
@@ -175,7 +180,7 @@
         "relevance": {
           "step1:remove_reason": {
             "type": "string",
-            "ex": "equalTo(., \"Died\")"
+            "ex": "equalTo(., \"Décédé\")"
           }
         }
       },
@@ -191,7 +196,7 @@
         "relevance": {
           "step1:remove_reason": {
             "type": "string",
-            "ex": "equalTo(., \"Died\")"
+            "ex": "equalTo(., \"Décédé\")"
           }
         },
         "calculation": {
diff --git a/opensrp-chw/src/main/assets/json.form/family_details_remove_family_fr.json b/opensrp-chw/src/main/assets/json.form/family_details_remove_family_fr.json
index de1ab4b0c2..b0a71652d4 100644
--- a/opensrp-chw/src/main/assets/json.form/family_details_remove_family_fr.json
+++ b/opensrp-chw/src/main/assets/json.form/family_details_remove_family_fr.json
@@ -107,6 +107,10 @@
           "Déménagé",
           "Autre"
         ],
+        "keys": [
+          "Moved away",
+          "Other"
+        ],
         "v_required": {
           "value": "true",
           "err": "Sélectionnez la raison pour enlever le dossier de la famille"
@@ -141,7 +145,7 @@
         "relevance": {
           "step1:remove_reason": {
             "type": "string",
-            "ex": "equalTo(., \"Moved away\")"
+            "ex": "equalTo(., \"Déménagé\")"
           }
         }
       }
diff --git a/opensrp-chw/src/main/assets/json.form/family_details_remove_member_fr.json b/opensrp-chw/src/main/assets/json.form/family_details_remove_member_fr.json
index 316fedb1ea..56f8fef981 100644
--- a/opensrp-chw/src/main/assets/json.form/family_details_remove_member_fr.json
+++ b/opensrp-chw/src/main/assets/json.form/family_details_remove_member_fr.json
@@ -103,6 +103,11 @@
           "Déménagé",
           "Autre"
         ],
+        "keys": [
+          "Died",
+          "Moved away",
+          "Other"
+        ],
         "openmrs_choice_ids": {
           "Décédé": "160034AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
           "Déménagé": "160415AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -145,7 +150,7 @@
         "relevance": {
           "step1:remove_reason": {
             "type": "string",
-            "ex": "equalTo(., \"Moved away\")"
+            "ex": "equalTo(., \"Déménagé\")"
           }
         }
       },
diff --git a/opensrp-chw/src/main/assets/json.form/family_member_register_fr.json b/opensrp-chw/src/main/assets/json.form/family_member_register_fr.json
index 88e1cc2946..cbee3ae350 100644
--- a/opensrp-chw/src/main/assets/json.form/family_member_register_fr.json
+++ b/opensrp-chw/src/main/assets/json.form/family_member_register_fr.json
@@ -271,6 +271,10 @@
           "Mâle",
           "Femelle"
         ],
+        "keys": [
+          "Male",
+          "Female"
+        ],
         "v_required": {
           "value": "true",
           "err": "Veuillez entrer le sexe"
@@ -286,6 +290,10 @@
         "values": [
           "Oui",
           "Non"
+        ],
+        "keys": [
+          "Yes",
+          "No"
         ]
       },
       {
@@ -310,7 +318,7 @@
         "relevance": {
           "step1:primary_caregiver": {
             "type": "string",
-            "ex": "equalTo(., \"Yes\")"
+            "ex": "equalTo(., \"Oui\")"
           }
         }
       },
@@ -332,7 +340,7 @@
         "relevance": {
           "step1:primary_caregiver": {
             "type": "string",
-            "ex": "equalTo(., \"Yes\")"
+            "ex": "equalTo(., \"Oui\")"
           }
         }
       },
@@ -350,16 +358,22 @@
           "Secondaire",
           "Postsecondaire"
         ],
+        "keys": [
+          "None",
+          "Primary",
+          "Secondary",
+          "Post-secondary"
+        ],
         "openmrs_choice_ids": {
-          "Aucun": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-          "Primaire": "1713AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-          "Secondaire": "1714AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-          "Postsecondaire": "159785AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          "None": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+          "Primary": "1713AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+          "Secondary": "1714AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+          "Post-secondary": "159785AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
         },
         "relevance": {
           "step1:primary_caregiver": {
             "type": "string",
-            "ex": "equalTo(., \"Yes\")"
+            "ex": "equalTo(., \"Oui\")"
           }
         }
       }
diff --git a/opensrp-chw/src/main/assets/json.form/family_register_fr.json b/opensrp-chw/src/main/assets/json.form/family_register_fr.json
index 2ffb8e3096..055ef2f702 100644
--- a/opensrp-chw/src/main/assets/json.form/family_register_fr.json
+++ b/opensrp-chw/src/main/assets/json.form/family_register_fr.json
@@ -163,6 +163,19 @@
           "Communications, services sociaux et personnelles",
           "Autre"
         ],
+        "keys": [
+          "Petty trade",
+          "Agriculture, hunting and fishing",
+          "Exploitation of mines and quarries",
+          "Manufacturing industry",
+          "Construction",
+          "Electricity, gas and water",
+          "Commercial, hotels and restaurants",
+          "Transport, storage and communications",
+          "Financial institutions",
+          "Communication, social and personal services",
+          "Other"
+        ],
         "openmrs_choice_ids": {
           "Petty trade": "1539AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
           "Agriculture, hunting and fishing": "165411AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -390,6 +403,10 @@
           "Mâle",
           "Femelle"
         ],
+        "keys": [
+          "Male",
+          "Female"
+        ],
         "v_required": {
           "value": "true",
           "err": "Veuillez entrer le sexe"
@@ -445,6 +462,12 @@
           "Secondaire",
           "Postsecondaire"
         ],
+        "keys": [
+          "None",
+          "Primary",
+          "Secondary",
+          "Post-secondary"
+        ],
         "openmrs_choice_ids": {
           "Aucun": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
           "Primaire": "1713AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
diff --git a/opensrp-chw/src/main/assets/json.form/observation_illness_fr.json b/opensrp-chw/src/main/assets/json.form/observation_illness_fr.json
index d268122cad..6f2891ecdb 100644
--- a/opensrp-chw/src/main/assets/json.form/observation_illness_fr.json
+++ b/opensrp-chw/src/main/assets/json.form/observation_illness_fr.json
@@ -94,6 +94,11 @@
           "Référé",
           "Aucun mesure prise"
         ],
+        "keys": [
+          "Managed",
+          "Referred",
+          "No action taken"
+        ],
         "openmrs_choice_ids": {
           "Géré": "140959AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
           "Référé": "1648AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",