diff --git a/ESSArch_Core/frontend/static/frontend/scripts/controllers/AgentModalInstanceCtrl.js b/ESSArch_Core/frontend/static/frontend/scripts/controllers/AgentModalInstanceCtrl.js
index abc3adcf7..380a588fa 100644
--- a/ESSArch_Core/frontend/static/frontend/scripts/controllers/AgentModalInstanceCtrl.js
+++ b/ESSArch_Core/frontend/static/frontend/scripts/controllers/AgentModalInstanceCtrl.js
@@ -354,7 +354,6 @@ export default class AgentModalInstanceCtrl {
               },
               refresh: function (search) {
                 return $ctrl.getLanguages(search).then(function () {
-                  this.options = $ctrl.options.language.choices;
                   return $ctrl.options.language.choices;
                 });
               },
diff --git a/ESSArch_Core/frontend/static/frontend/scripts/controllers/ArchiveModalInstanceCtrl.js b/ESSArch_Core/frontend/static/frontend/scripts/controllers/ArchiveModalInstanceCtrl.js
index 5744ce219..cbcb49a68 100644
--- a/ESSArch_Core/frontend/static/frontend/scripts/controllers/ArchiveModalInstanceCtrl.js
+++ b/ESSArch_Core/frontend/static/frontend/scripts/controllers/ArchiveModalInstanceCtrl.js
@@ -149,7 +149,6 @@ export default class ArchiveModalInstanceCtrl {
                 $ctrl.initStructureSearch = null;
               }
               return $ctrl.getStructures(search).then(function () {
-                this.options = $ctrl.options.structures;
                 return $ctrl.options.structures;
               });
             },
@@ -178,7 +177,6 @@ export default class ArchiveModalInstanceCtrl {
                   $ctrl.initAgentSearch = null;
                 }
                 return $ctrl.getAgents(search).then(function () {
-                  this.options = $ctrl.options.agents;
                   return $ctrl.options.agents;
                 });
               },
diff --git a/ESSArch_Core/frontend/static/frontend/scripts/services/structureName.js b/ESSArch_Core/frontend/static/frontend/scripts/services/structureName.js
index 024694727..2ce374bbb 100644
--- a/ESSArch_Core/frontend/static/frontend/scripts/services/structureName.js
+++ b/ESSArch_Core/frontend/static/frontend/scripts/services/structureName.js
@@ -1,10 +1,11 @@
 const StructureName = ($filter, $translate) => {
   function getNameWithVersion(structure) {
-    const versionTestructuret = $translate.instant('VERSION');
+    if (!structure) return '';
+    const versionText = $translate.instant('VERSION');
     return (
       structure.name +
       ' ' +
-      versionTestructuret +
+      versionText +
       ' ' +
       structure.version +
       (structure.start_date !== null || structure.end_date !== null
@@ -15,7 +16,7 @@ const StructureName = ($filter, $translate) => {
     );
   }
   return {
-    // getNameWithVersion: getNameWithVersion,
+    getNameWithVersion: getNameWithVersion,
     parseStructureNames: function (structures) {
       structures.forEach(function (structure) {
         structure.name_with_version = getNameWithVersion(structure);
diff --git a/ESSArch_Core/frontend/static/frontend/styles/modules/step_task.scss b/ESSArch_Core/frontend/static/frontend/styles/modules/step_task.scss
index c5247017d..1e36e33da 100644
--- a/ESSArch_Core/frontend/static/frontend/styles/modules/step_task.scss
+++ b/ESSArch_Core/frontend/static/frontend/styles/modules/step_task.scss
@@ -29,12 +29,20 @@
   }
 }
 
-.param-value {
-  word-break: normal;
-  pre {
-    overflow-x: scroll;
-    white-space: pre-wrap;
-  }
+.result-table {
+  table-layout: fixed;
+  width: 100%;
+}
+
+.result-table .result-value {
+  overflow: auto;
+}
+
+.result-table .result-value pre {
+  max-width: 100%;
+  max-height: 300px;
+  overflow: auto;
+  white-space: pre;
 }
 
 .step-task-info {
diff --git a/ESSArch_Core/frontend/static/frontend/views/modals/task_info_modal.html b/ESSArch_Core/frontend/static/frontend/views/modals/task_info_modal.html
index 84014cfbf..acf493253 100644
--- a/ESSArch_Core/frontend/static/frontend/views/modals/task_info_modal.html
+++ b/ESSArch_Core/frontend/static/frontend/views/modals/task_info_modal.html
@@ -95,27 +95,24 @@
     </div>
 
     <br />
-    <table class="table">
+    <table class="table result-table">
       <tbody>
         <tr>
           <td>
-            <div style="max-height: 300px; overflow-y: auto">
-              <b>{{ "STATE_TREE.ARGUMENTS" | translate }}:</b>
-              <table class="table">
-                <tbody>
-                  {{ $ctrl.getArgsString(currentStepTask.args_parsed) }}
-                  <span ng-if="currentStepTask.args_parsed.length === 0"> {{'NO_ARGUMENTS' | translate}} </span>
-                </tbody>
-              </table>
+            <b>{{ "STATE_TREE.ARGUMENTS" | translate }}:</b>
+            <span ng-if="currentStepTask.args_parsed.length === 0"> {{'NO_ARGUMENTS' | translate}} <br /><br /></span>
+            <div ng-if="currentStepTask.args_parsed.length > 0">
+              <pre>{{ $ctrl.getArgsString(currentStepTask.args_parsed) }}</pre>
             </div>
+
+            <b>{{ ("PARAMETERS" | translate) + ":" }}</b>
+            <span ng-if="angular.equals(currentStepTask.params_parsed, {})"> {{'NO_PARAMETERS' | translate}} </span>
             <div style="max-height: 300px; overflow-y: auto">
-              <b>{{ ("PARAMETERS" | translate) + ":" }}</b>
-              <span ng-if="angular.equals(currentStepTask.params_parsed, {})"> {{'NO_PARAMETERS' | translate}} </span>
               <table class="table">
                 <tbody>
                   <tr ng-repeat="(key, value) in currentStepTask.params_parsed track by $index">
                     <td>{{ key }}</td>
-                    <td class="param-value">
+                    <td class="result-value">
                       <pre>{{ value | json }}</pre>
                     </td>
                   </tr>
@@ -127,9 +124,9 @@
       </tbody>
       <tbody>
         <tr ng-if="currentStepTask.status == 'SUCCESS'">
-          <td>
+          <td class="result-value">
             <b>{{ ("RESULT" | translate) + ":" }}</b>
-            {{ currentStepTask.result }}
+            <pre>{{ currentStepTask.result }}</pre>
           </td>
         </tr>
         <tr