diff --git a/module/my/control.php b/module/my/control.php
index 5c4b1c29fa..694bbe83a5 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -417,7 +417,9 @@ EOF;
         $this->loadModel('execution');
         $queryID  = ($type == 'bySearch') ? (int)$param : 0;
 
+
         /* Save session. */
+        if($type != 'bySearch')            $this->session->set('myTaskType', $type);
         if($this->app->viewType != 'json') $this->session->set('taskList', $this->app->getURI(true), 'execution');
 
         /* Load pager. */
@@ -521,8 +523,10 @@ EOF;
         $this->loadModel('bug');
         $this->app->loadLang('bug');
         $queryID  = ($type == 'bySearch') ? (int)$param : 0;
+        if($type != 'bySearch')            $this->session->set('myBugType', $type);
         if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true), 'qa');
 
+
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         if($this->app->getViewType() == 'mhtml') $recPerPage = 10;
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index edff420e76..f5c3915818 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -52,6 +52,7 @@
     ?>
     <table class="table has-sort-head table-fixed" id='bugList'>
       <?php $vars = "mode=$mode&type=$type&param=myQueryID&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+      <?php $type = $type == 'bySearch' ? $this->session->myBugType : $type;?>
       <thead>
         <tr>
           <th class="c-id">
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 0d3eb6ea33..742fcd78dd 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -50,6 +50,7 @@
     <div class="table-responsive">
       <table class="table has-sort-head table-fixed" id='taskTable'>
         <?php $vars = "mode=$mode&type=$type&param=myQueryID&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+        <?php $type = $type == 'bySearch' ? $this->session->myTaskType : $type;?>
         <thead>
           <tr>
             <th class="c-id">