diff --git a/module/execution/model.php b/module/execution/model.php
index bc4b048e4c..355ee67754 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1409,7 +1409,7 @@ class executionModel extends model
                 ->andWhere('t2.deleted')->eq(0)
                 ->fetchPairs();
 
-            $products = $this->loadModel('product')->getProductPairsByProject($projectID);
+            $products = $this->loadModel('product')->getProductPairsByProject($projectID, 'all', $executionProducts);
 
             foreach($executions as $id => $execution)
             {
diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php
index c84e4df11f..4492c2a68f 100755
--- a/module/my/view/changepassword.html.php
+++ b/module/my/view/changepassword.html.php
@@ -45,7 +45,7 @@
         <td><?php echo html::password('password2', '', "class='form-control'");?></td>
       </tr>
       <tr>
-        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::backButton();?></td>
+        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton();?></td>
       </tr>
     </table>
     <?php if(!empty($this->app->user->modifyPasswordReason)):?>
diff --git a/module/task/control.php b/module/task/control.php
index e7d5578ab6..8bd42239c2 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -798,7 +798,7 @@ class task extends control
                 $execution    = $this->execution->getByID($task->execution);
                 $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                 $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                if(($this->app->tab == 'execution' or ($this->config->vision == 'lite' and $this->app->tab == 'project')) and $execution->type == 'kanban')
+                if(($this->app->tab == 'execution' or ($this->config->vision == 'lite' and $this->app->tab == 'project' and $this->session->kanbanview == 'kanban')) and $execution->type == 'kanban')
                 {
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
diff --git a/xuanxuan/extension/xuan/misc/ext/control/downloadclient.php b/xuanxuan/extension/xuan/misc/ext/control/downloadclient.php
index 370e01f042..e74d94ff3e 100644
--- a/xuanxuan/extension/xuan/misc/ext/control/downloadclient.php
+++ b/xuanxuan/extension/xuan/misc/ext/control/downloadclient.php
@@ -102,7 +102,7 @@ class myMisc extends misc
 
         if($action == 'downloadPackage')
         {
-            ini_set('memory_limit', '512M');
+            ini_set('memory_limit', '1G');
             $account   = $this->app->user->account;
             $clientDir = $this->app->wwwRoot . 'data/client/' . "$account/";