diff --git a/apps/maarch_entreprise/indexing_searching/search_adv.php b/apps/maarch_entreprise/indexing_searching/search_adv.php
index d4e2f6fe79e1ce17c5b964b00138ea81c7b58201..d40820eec886330cf053f5bd5462f97a9035b6f5 100755
--- a/apps/maarch_entreprise/indexing_searching/search_adv.php
+++ b/apps/maarch_entreprise/indexing_searching/search_adv.php
@@ -137,8 +137,15 @@ foreach ($customFields as $customField) {
         $arr_tmp = array();
         array_push($arr_tmp, array('VALUE' => '', 'LABEL' => _CHOOSE.'...'));
         $customValues = json_decode($customField['values'], true);
-        foreach ($customValues as $customValue) {
-            array_push($arr_tmp, array('VALUE' => $customValue, 'LABEL' => $customValue));
+        if (!empty($customValues['table'])) {
+            $customValues = \CustomField\models\CustomFieldModel::getValuesSQL($customValues);
+            foreach ($customValues as $customInfo) {
+                array_push($arr_tmp, array('VALUE' => $customInfo['key'], 'LABEL' => $customInfo['label']));
+            }
+        } else {
+            foreach ($customValues as $customValue) {
+                array_push($arr_tmp, array('VALUE' => $customValue, 'LABEL' => $customValue));
+            }
         }
         $arr_tmp2 = array('label' => $customField['label'], 'type' => 'select_simple', 'param' => array('field_label' => $customField['label'], 'default_label' => '', 'options' => $arr_tmp));
     } elseif ($customField['type'] == 'date') {
@@ -379,7 +386,8 @@ $src_tab = $tab[0];
         <script type="text/javascript">
             <!--
             var valeurs = {
-                <?php echo $tab[1]; ?> };
+                <?php echo $tab[1]; ?>
+            };
             var loaded_query =
                 <?php if (isset($_SESSION['current_search_query']) && !empty($_SESSION['current_search_query'])) {
     echo $_SESSION['current_search_query'];
diff --git a/src/app/customField/controllers/CustomFieldController.php b/src/app/customField/controllers/CustomFieldController.php
index 3f2055199edae244acb3e8dda8180456c62e2b6f..2cc8052a58496da276154c12659f1f3ee7720985 100644
--- a/src/app/customField/controllers/CustomFieldController.php
+++ b/src/app/customField/controllers/CustomFieldController.php
@@ -44,7 +44,11 @@ class CustomFieldController
             if (empty($queryParams['admin']) || !PrivilegeController::hasPrivilege(['privilegeId' => 'admin_custom_fields', 'userId' => $GLOBALS['id']])) {
                 if (!empty($customFields[$key]['values']['table'])) {
                     $customFields[$key]['values'] = CustomFieldModel::getValuesSQL($customFields[$key]['values']);
-                    if ($customField['type'] == 'string') {
+                    if (in_array($customField['type'], ['select', 'radio', 'checkbox'])) {
+                        foreach ($customFields[$key]['values'] as $iKey => $sValue) {
+                            $customFields[$key]['values'][$iKey]['key'] = (string)$sValue['key'];
+                        }
+                    } elseif ($customField['type'] == 'string') {
                         $customFields[$key]['values'][0]['key'] = (string)$customFields[$key]['values'][0]['key'];
                     } elseif ($customField['type'] == 'integer') {
                         $customFields[$key]['values'][0]['key'] = (int)$customFields[$key]['values'][0]['key'];
diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php
index 1a58a9661ed3fe61d1d7c50fc2625a5aa13d4629..4c5010708d50bd2f924ee91adda5e96408da94ee 100755
--- a/src/app/resource/controllers/StoreController.php
+++ b/src/app/resource/controllers/StoreController.php
@@ -185,6 +185,13 @@ class StoreController
                     $date = new \DateTime($value);
                     $value = $date->format('Y-m-d');
                     $args['customFields'][$key] = $value;
+                } elseif ($customField['type'] != 'integer' && !is_array($value)) {
+                    $args['customFields'][$key] = (string)$value;
+                } elseif ($customField['type'] != 'integer' && is_array($value)) {
+                    foreach ($value as $iKey => $sValue) {
+                        $value[$iKey] = (string)$sValue;
+                    }
+                    $args['customFields'][$key] = $value;
                 }
             }
         }
@@ -251,32 +258,32 @@ class StoreController
         if (!empty($args['initiator'])) {
             $entity = EntityModel::getById(['id' => $args['initiator'], 'select' => ['entity_id']]);
             $preparedData['initiator'] = $entity['entity_id'];
-        } else if (array_key_exists('initiator', $definedVars['args'])) {
+        } elseif (array_key_exists('initiator', $definedVars['args'])) {
             $preparedData['initiator'] = null;
         }
         if (isset($args['documentDate'])) {
             $preparedData['doc_date'] = $args['documentDate'];
-        } else if (array_key_exists('documentDate', $definedVars['args'])) {
+        } elseif (array_key_exists('documentDate', $definedVars['args'])) {
             $preparedData['doc_date'] = null;
         }
         if (isset($args['arrivalDate'])) {
             $preparedData['admission_date'] = $args['arrivalDate'];
-        } else if (array_key_exists('arrivalDate', $definedVars['args'])) {
+        } elseif (array_key_exists('arrivalDate', $definedVars['args'])) {
             $preparedData['admission_date'] = null;
         }
         if (isset($args['departureDate'])) {
             $preparedData['departure_date'] = $args['departureDate'];
-        } else if (array_key_exists('departureDate', $definedVars['args'])) {
+        } elseif (array_key_exists('departureDate', $definedVars['args'])) {
             $preparedData['departure_date'] = null;
         }
         if (isset($args['processLimitDate'])) {
             $preparedData['process_limit_date'] = $args['processLimitDate'];
-        } else if (array_key_exists('processLimitDate', $definedVars['args'])) {
+        } elseif (array_key_exists('processLimitDate', $definedVars['args'])) {
             $preparedData['process_limit_date'] = null;
         }
         if (isset($args['priority'])) {
             $preparedData['priority'] = $args['priority'];
-        } else if (array_key_exists('priority', $definedVars['args'])) {
+        } elseif (array_key_exists('priority', $definedVars['args'])) {
             $preparedData['priority'] = null;
         }
         if (!empty($args['processLimitDate']) && !empty($args['priority'])) {
@@ -298,6 +305,13 @@ class StoreController
                     $date = new \DateTime($value);
                     $value = $date->format('Y-m-d');
                     $args['customFields'][$key] = $value;
+                } elseif ($customField['type'] != 'integer' && !is_array($value)) {
+                    $args['customFields'][$key] = (string)$value;
+                } elseif ($customField['type'] != 'integer' && is_array($value)) {
+                    foreach ($value as $iKey => $sValue) {
+                        $value[$iKey] = (string)$sValue;
+                    }
+                    $args['customFields'][$key] = $value;
                 }
             }
             $preparedData['custom_fields'] = json_encode($args['customFields']);