diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index 46474e562faffbecf3859956142c840cbfbef96d..80800b6a59345586967bef23d9c1e1063f490f5a 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -397,7 +397,7 @@ class MergeController
         $data = [
             'chrono'      => $prefix . $args['chrono'],
             'resIdMaster' => $args['resIdMaster'],
-            'originId'    => $args['originId'],
+            'resId'       => $args['resId'],
             'title'       => $args['title']
         ];
         $data = json_encode($data);
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 110d6a5c9402a7b2f0dca9f5fa4875f4a892ced2..25bf2730ff8231e396761a3cabb459b8f8a7dfb1 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -1365,6 +1365,7 @@ class ResController extends ResourceControlController
             $docserver = DocserverModel::getByDocserverId(['docserverId' => $resource['docserver_id'], 'select' => ['path_template']]);
             $resource['docserverPathFile'] = $docserver['path_template'] . $resource['path'];
             $resource['docserverPathFile'] = str_replace('//', '/', $resource['docserverPathFile']);
+            $resource['docserverPathFile'] = str_replace('#', '/', $resource['docserverPathFile']);
         }
 
         $resource['creationDate'] = $resource['creation_date'];
diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php
index 9daaf2aff82049408d613c6c9affa9eafd5f00e2..9ce2ac77e2ac563061ec8c45b436a58831a63246 100755
--- a/src/app/resource/controllers/StoreController.php
+++ b/src/app/resource/controllers/StoreController.php
@@ -53,7 +53,7 @@ class StoreController
                     $uniqueId    = CoreConfigModel::uniqueId();
                     $tmpFilename = "storeTmp_{$GLOBALS['id']}_{$uniqueId}.{$args['format']}";
                     file_put_contents($tmpPath . $tmpFilename, $fileContent);
-                    $fileContent = MergeController::mergeChronoDocument(['chrono' => $data['alt_identifier'], 'path' => $tmpPath . $tmpFilename, 'type' => 'resource', 'resIdMaster' => $resId, 'originId' => null, 'title' => $data['subject']]);
+                    $fileContent = MergeController::mergeChronoDocument(['chrono' => $data['alt_identifier'], 'path' => $tmpPath . $tmpFilename, 'type' => 'resource', 'resIdMaster' => $resId, 'resId' => null, 'title' => $data['subject']]);
                     $fileContent = base64_decode($fileContent['encodedDocument']);
                     unlink($tmpPath . $tmpFilename);
                 }
@@ -109,7 +109,7 @@ class StoreController
                     $uniqueId = CoreConfigModel::uniqueId();
                     $tmpFilename = "storeTmp_{$GLOBALS['id']}_{$uniqueId}.{$args['format']}";
                     file_put_contents($tmpPath . $tmpFilename, $fileContent);
-                    $fileContent = MergeController::mergeChronoDocument(['chrono' => $data['identifier'], 'path' => $tmpPath . $tmpFilename, 'type' => 'attachment', 'resIdMaster' => $data['res_id_master'], 'originId' => $resId, 'title' => $data['title']]);
+                    $fileContent = MergeController::mergeChronoDocument(['chrono' => $data['identifier'], 'path' => $tmpPath . $tmpFilename, 'type' => 'attachment', 'resIdMaster' => $data['res_id_master'], 'resId' => $resId, 'title' => $data['title']]);
                     $fileContent = base64_decode($fileContent['encodedDocument']);
                     unlink($tmpPath . $tmpFilename);
                 }