diff --git a/module/execution/js/tree.js b/module/execution/js/tree.js
index 3e0513c76b..5503634ad1 100644
--- a/module/execution/js/tree.js
+++ b/module/execution/js/tree.js
@@ -185,6 +185,7 @@ $(function()
     $taskTree.on('click', '.tree-link', function(e)
     {
         var $link = $(this);
+        $.zui.store.set('project/tree/parentLi', $link.closest('li').attr('data-id').length > 0 ? $link.closest('li').attr('data-id') : '')
         showItem($link.attr('href'), $link.find('.title').text());
         $taskTree.find('li.selected').removeClass('selected');
         $link.closest('li').addClass('selected');
@@ -205,10 +206,11 @@ $(function()
     }).on('ready', function()
     {
         var lastUrl = $.zui.store.get('project/tree/showItem');
+        var lastLi  = $.zui.store.get('project/tree/parentLi');
         if(lastUrl)
         {
             showItem(lastUrl);
-            $taskTree.find('.tree-link[href="' + lastUrl + '"]').closest('li').addClass('selected');
+            $taskTree.find('li[data-id="' + lastLi + '"]').find('.tree-link[href="' + lastUrl + '"]').closest('li').addClass('selected');
         }
     });
 });
diff --git a/module/execution/view/treetask.html.php b/module/execution/view/treetask.html.php
index 388aa093bf..287204f2ee 100644
--- a/module/execution/view/treetask.html.php
+++ b/module/execution/view/treetask.html.php
@@ -75,7 +75,7 @@
   <div class='detail-title'><?php echo $lang->task->case;?></div>
   <div class='detail-content article-content'>
     <ul class='list-unstyled'>
-      <?php foreach($task->cases as $caseID => $case) echo '<li>' . html::a($this->createLink('testcase', 'view', "caseID=$caseID", '', true), "#$caseID " . $case, '', "data-toggle='modal' data-type='iframe' data-width='90%'") . '</li>';?>
+      <?php foreach($task->cases as $caseID => $case) echo '<li>' . html::a($this->createLink('testcase', 'view', "caseID=$caseID"), "#$caseID " . $case) . '</li>';?>
     </ul>
   </div>
 </div>
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index deae240217..58be339456 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -1205,7 +1205,7 @@ function createCardMenu(options)
             items.push({label: kanbanLang.finishCard, icon: 'checked', onClick: function(){finishCard(card.id, card.kanban, card.region);}});
         }
     }
-    if(privs.includes('archiveCard') && kanban.archived == '1') items.push({label: kanbanLang.archiveCard, icon: 'card-archive', url: createLink('kanban', 'archiveCard', 'cardID=' + card.id), attrs: {'target': 'hiddenwin'}});
+    if(privs.includes('archiveCard') && kanban.archived == '1') items.push({label: kanbanLang.archiveCard, icon: 'card-archive', url: createLink('kanban', 'archiveCard', 'cardID=' + card.id), attrs: {'target': 'hiddenwin'}, onClick:function(){$('#archivedCards').replaceWith("<div id='archivedCards'></div>");}});
 
     var editCardAction    = (privs.includes('editCard') && card.fromType == '') ? true : false;
     var deleteCardAction  = privs.includes('deleteCard');
@@ -1296,7 +1296,7 @@ function createColumnMenu(options)
     var otherActions = ((privs.includes('archiveColumn') && kanban.archived == '1') || privs.includes('deleteColumn')) ? true : false;
     if(columnActions && otherActions) items.push({type: 'divider'});
 
-    if(privs.includes('archiveColumn') && kanban.archived == '1') items.push({label: kanbanLang.archiveColumn, icon: 'card-archive', url: createLink('kanban', 'archiveColumn', 'columnID=' + column.id), attrs: {'target': 'hiddenwin'}});
+    if(privs.includes('archiveColumn') && kanban.archived == '1') items.push({label: kanbanLang.archiveColumn, icon: 'card-archive', url: createLink('kanban', 'archiveColumn', 'columnID=' + column.id), attrs: {'target': 'hiddenwin'}, onClick:function(){$('#archivedColumns').replaceWith("<div id='archivedColumns'></div>");}});
     if(privs.includes('deleteColumn')) items.push({label: kanbanLang.deleteColumn, icon: 'trash', url: createLink('kanban', 'deleteColumn', 'columnID=' + column.id), attrs: {'target': 'hiddenwin'}});
 
     var bounds = options.$trigger[0].getBoundingClientRect();
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index d0cbb394db..b4e70ffd84 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7161,7 +7161,7 @@ class upgradeModel extends model
     {
         if(empty($this->config->URAndSR)) return true;
 
-        $sql = "REPLACE INTO zt_grouppriv SELECT `group`,'requirement' as 'module',`method` FROM `zt_grouppriv` WHERE `module` = 'story' AND `method` in ('create', 'batchEdit', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'assignTo', 'batchAssignTo', 'activate', 'report', 'linkStory', 'batchChangeBranch', 'batchChangeModule', 'linkStories', 'batchEdit', 'import', 'exportTemplate')";
+        $sql = "REPLACE INTO " . TABLE_GROUPPRIV . " SELECT `group`,'requirement' as 'module',`method` FROM `zt_grouppriv` WHERE `module` = 'story' AND `method` in ('create', 'batchEdit', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'assignTo', 'batchAssignTo', 'activate', 'report', 'linkStory', 'batchChangeBranch', 'batchChangeModule', 'linkStories', 'batchEdit', 'import', 'exportTemplate')";
         $this->dbh->exec($sql);
         return true;
     }