diff --git a/module/execution/control.php b/module/execution/control.php
index 95558e6b3a..241ecf71b9 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2063,7 +2063,7 @@ class execution extends control
 
             $this->session->set('execution', '');
             $this->executeHooks($executionID);
-            die(js::locate(inlink('index'), 'parent'));
+            die(js::reload('parent'));
         }
     }
 
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 8443f62667..7e8f1d88fb 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -117,7 +117,7 @@ body {margin-bottom: 25px;}
       <ul class="dropdown-menu pull-right" id='exportActionMenu'>
         <?php
         $class = common::hasPriv('task', 'export') ? '' : "class=disabled";
-        $misc  = common::hasPriv('task', 'export') ? "class='export'" : "class=disabled";
+        $misc  = common::hasPriv('task', 'export') ? "class='export iframe'" : "class=disabled";
         $link  = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "execution=$executionID&orderBy=$orderBy&type=$browseType") : '#';
         echo "<li $class>" . html::a($link, $lang->task->export, '', $misc) . "</li>";
         ?>
diff --git a/module/task/control.php b/module/task/control.php
index beb6e3c0bf..bf17a1c7ef 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1423,7 +1423,7 @@ class task extends control
 
             /* Get users and executions. */
             $users      = $this->loadModel('user')->getPairs('noletter');
-            $executions = $this->execution->getPairs($this->session->execution, 'all', 'all|nocode');
+            $executions = $this->execution->getPairs($execution->project, 'all', 'all|nocode');
 
             /* Get related objects id lists. */
             $relatedStoryIdList  = array();