diff --git a/module/testtask/control.php b/module/testtask/control.php
index b1c462d387..6db1facb27 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -964,7 +964,7 @@ class testtask extends control
             ->andWhere('t2.status')->ne('wait')
             ->fetchGroup('case', 'id');
 
-        $this->view->caseIDList = $caseIDList;
+        $this->view->caseIDList = array_keys($cases);
         $this->view->productID  = $productID;
         $this->view->title      = $this->lang->testtask->batchRun;
         $this->view->position[] = $this->lang->testtask->common;
diff --git a/module/tree/model.php b/module/tree/model.php
index ef61693265..e1579ccd74 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -39,24 +39,21 @@ class treeModel extends model
             ->beginIF($type == 'bug')->orWhere('type')->eq('bug')->fi()
             ->beginIF($type == 'case')->orWhere('type')->eq('case')->fi()
             ->andWhere('deleted')->eq('0')
+            ->orderBy('grade asc')
             ->fetchAll();
 
         $pairs    = array();
         $pairs[0] = '/';
         foreach($modules as $module)
         {
-            if($module->parent == '0') 
+            if($module->grade == 1) 
             {
                 $pairs[$module->id] = '/' . $module->name;
                 continue;
             }
 
-            $path           = substr($module->path, 1, -1);
-            $relatedModules = $this->dao->select('id, name')->from(TABLE_MODULE)->where('id')->in($path)->orderBy('grade')->fetchPairs();
-            $modulePath     = '';
-
-            foreach($relatedModules as $moduleName) $modulePath .= '/' . $moduleName; 
-            $pairs[$module->id] = $modulePath;
+            $moduleName = '/' . $module->name;
+            $pairs[$module->id] = isset($pairs[$module->parent]) ? $pairs[$module->parent] . $moduleName : $moduleName;
         }
 
         return $pairs;