diff --git a/module/block/control.php b/module/block/control.php
index fa837a08ef..7b9ecd383c 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -701,7 +701,7 @@ class block extends control
         $this->session->set('buildList',    $this->app->getURI(true), 'execution');
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
 
-        $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
+        $this->view->testtasks = $this->dao->select('distinct t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
             ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.execution=t4.id')
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 1f938d3fae..983e45a2dd 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1861,7 +1861,7 @@ class testcase extends control
         $branchModules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, empty($branches) ? array(0) : array_keys($branches));
         foreach($branchModules as $branchID => $moduleList)
         {
-            foreach($moduleList as $moduleID => $moduleName) $modules[$moduleID] = $moduleName;
+            foreach($moduleList as $moduleID => $moduleName) $modules[$branchID][$moduleID] = $moduleName;
         }
 
         if(!empty($maxImport) and file_exists($tmpFile))
@@ -2049,6 +2049,7 @@ class testcase extends control
         $this->view->product    = $this->products[$productID];
         $this->view->maxImport  = $maxImport;
         $this->view->dataInsert = $insert;
+
         $this->display();
     }
 
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 0b6cbc545a..6d3e9ae04b 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -81,7 +81,8 @@ $(function()
           </td>
           <td><?php echo html::input("title[$key]", htmlSpecialString($case->title, ENT_QUOTES), "class='form-control'")?></td>
           <td style='overflow:visible'>
-            <?php echo html::select("module[$key]", $modules, isset($case->module) ? $case->module : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->module : ''), "class='form-control chosen moduleChange'")?>
+            <?php $caseModules = (isset($case->branch) and $case->branch != 0) ? $modules[BRANCH_MAIN] + $modules[$case->branch] : $modules[BRANCH_MAIN];?>
+            <?php echo html::select("module[$key]", $caseModules, isset($case->module) ? $case->module : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->module : ''), "class='form-control chosen moduleChange'")?>
           </td>
           <td style='overflow:visible'>
           <?php $storyID = isset($case->story) ? $case->story : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->story : '');?>