diff --git a/apps/maarch_entreprise/indexing_searching/search_adv.php b/apps/maarch_entreprise/indexing_searching/search_adv.php
index 6269eb45e4e122c23e03b4961c9b7aa534287050..5a44e66a2d88cbec2ec285ecfe5ed7c72908b3ec 100755
--- a/apps/maarch_entreprise/indexing_searching/search_adv.php
+++ b/apps/maarch_entreprise/indexing_searching/search_adv.php
@@ -131,7 +131,7 @@ $size = '';
 $param = array();
 
 // Custom fields
-$customFields = \CustomField\models\CustomFieldModel::get();
+$customFields = \CustomField\models\CustomFieldModel::get(['orderBy' => ['label']]);
 foreach ($customFields as $customField) {
     $field = 'indexingCustomField_'.$customField['id'];
 
diff --git a/src/app/action/controllers/ActionMethodController.php b/src/app/action/controllers/ActionMethodController.php
index dc9d9b492c505c1322e24d97766accc6dac98662..80b8f3b3e912b727fde8ad7838c26285947f95f3 100644
--- a/src/app/action/controllers/ActionMethodController.php
+++ b/src/app/action/controllers/ActionMethodController.php
@@ -52,7 +52,7 @@ class ActionMethodController
 
     public static function terminateAction(array $aArgs)
     {
-        ValidatorModel::notEmpty($aArgs, ['id', 'resources', 'basketName']);
+        ValidatorModel::notEmpty($aArgs, ['id', 'resources']);
         ValidatorModel::intVal($aArgs, ['id']);
         ValidatorModel::arrayType($aArgs, ['resources']);
         ValidatorModel::stringType($aArgs, ['basketName', 'note', 'history']);
@@ -80,12 +80,15 @@ class ActionMethodController
             }
 
             if ($action['history'] == 'Y') {
+                $info = "{$action['label_action']}{$aArgs['history']}";
+                $info = empty($aArgs['basketName']) ? $info : "{$aArgs['basketName']} : {$info}";
                 HistoryController::add([
                     'tableName' => 'res_letterbox',
                     'recordId'  => $resource,
                     'eventType' => 'ACTION#' . $resource,
+                    'moduleId'  => 'resource',
                     'eventId'   => $aArgs['id'],
-                    'info'      => "{$aArgs['basketName']} : {$action['label_action']}{$aArgs['history']}"
+                    'info'      => $info
                 ]);
 
                 //TODO M2M
diff --git a/src/app/customField/controllers/CustomFieldController.php b/src/app/customField/controllers/CustomFieldController.php
index 3f12f999c9aa1c42d0c9de279b736125c9f0aeb6..e043f9db2355e0d7eda66ebd6610527b44885119 100644
--- a/src/app/customField/controllers/CustomFieldController.php
+++ b/src/app/customField/controllers/CustomFieldController.php
@@ -29,7 +29,7 @@ class CustomFieldController
 {
     public function get(Request $request, Response $response)
     {
-        $customFields = CustomFieldModel::get();
+        $customFields = CustomFieldModel::get(['orderBy' => ['label']]);
 
         foreach ($customFields as $key => $customField) {
             $customFields[$key]['values'] = json_decode($customField['values'], true);
diff --git a/src/app/customField/models/CustomFieldModel.php b/src/app/customField/models/CustomFieldModel.php
index 236c723d7cd379ab6948a01a79ae14649d1794c5..81d7e6d8b4c9d891b74e359f1daa2460b8a3333c 100644
--- a/src/app/customField/models/CustomFieldModel.php
+++ b/src/app/customField/models/CustomFieldModel.php
@@ -29,7 +29,7 @@ class CustomFieldModel
             'table'     => ['custom_fields'],
             'where'     => empty($args['where']) ? [] : $args['where'],
             'data'      => empty($args['data']) ? [] : $args['data'],
-            'order_by'  => empty($args['orderBy']) ? ['label'] : $args['orderBy'],
+            'order_by'  => empty($args['orderBy']) ? [] : $args['orderBy'],
             'limit'     => empty($args['limit']) ? 0 : $args['limit']
         ]);
 
diff --git a/src/app/resource/controllers/IndexingController.php b/src/app/resource/controllers/IndexingController.php
index e65ea09d0be46865f922eb3eb137bbba990668df..52b45441307fad0e7c662feba935390d9aa2bcf6 100755
--- a/src/app/resource/controllers/IndexingController.php
+++ b/src/app/resource/controllers/IndexingController.php
@@ -101,7 +101,7 @@ class IndexingController
         }
 
         $historic = empty($methodResponse['history']) ? '' : $methodResponse['history'];
-        ActionMethodController::terminateAction(['id' => $args['actionId'], 'resources' => [$body['resource']], 'basketName' => 'Indexing', 'note' => $body['note'], 'history' => $historic]);
+        ActionMethodController::terminateAction(['id' => $args['actionId'], 'resources' => [$body['resource']], 'note' => $body['note'], 'history' => $historic]);
 
         if (!empty($methodResponses['data']) || !empty($methodResponses['errors'])) {
             return $response->withJson($methodResponses);
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index e567950c5170c1099aebfe208faa36ac4f6c8d58..8623cc9e79a8aae9e5bfd432ab970b0491b5a356 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -736,6 +736,9 @@ class ResController
 
     private static function controlResource(array $args)
     {
+        $currentUser = UserModel::getById(['id' => $GLOBALS['id'], 'select' => ['loginmode']]);
+        $isWebServiceUser = $currentUser['loginmode'] == 'restMode';
+
         $body = $args['body'];
 
         if (empty($body)) {
@@ -744,6 +747,8 @@ class ResController
             return ['errors' => 'Body doctype is empty or not an integer'];
         } elseif (!Validator::intVal()->notEmpty()->validate($body['modelId'])) {
             return ['errors' => 'Body modelId is empty or not an integer'];
+        } elseif ($isWebServiceUser && !Validator::stringType()->notEmpty()->validate($body['status'])) {
+            return ['errors' => 'Body modelId is empty or not an integer'];
         }
 
         $doctype = DoctypeModel::getById(['id' => $body['doctype'], 'select' => [1]]);
@@ -765,9 +770,6 @@ class ResController
             return ['errors' => $control['errors']];
         }
 
-        $currentUser = UserModel::getById(['id' => $GLOBALS['id'], 'select' => ['loginmode']]);
-        $isWebServiceUser = $currentUser['loginmode'] == 'restMode';
-
         $control = ResController::controlAdjacentData(['body' => $body, 'isWebServiceUser' => $isWebServiceUser]);
         if (!empty($control['errors'])) {
             return ['errors' => $control['errors']];