diff --git a/module/build/model.php b/module/build/model.php
index 0acaced72d..5095fe3f7b 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -71,7 +71,7 @@ class buildModel extends model
         if(strpos($params, 'noempty') === false) $sysBuilds = array('' => '');
         if(strpos($params, 'notrunk') === false) $sysBuilds = $sysBuilds + array('trunk' => 'Trunk');
 
-        $projectBuilds = $this->dao->select('t1.id, t1.name, t4.name as branchName')->from(TABLE_BUILD)->alias('t1')
+        $projectBuilds = $this->dao->select('t1.id, t1.name, t3.status as releaseStatus, t4.name as branchName')->from(TABLE_BUILD)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->leftJoin(TABLE_RELEASE)->alias('t3')->on('t1.id = t3.build')
             ->leftJoin(TABLE_BRANCH)->alias('t4')->on('t1.branch = t4.id')
@@ -79,13 +79,16 @@ class buildModel extends model
             ->beginIF($productID)->andWhere('t1.product')->eq((int)$productID)->fi()
             ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
             ->beginIF(strpos($params, 'nodone') !== false)->andWhere('t2.status')->ne('done')->fi()
-            ->beginIF(strpos($params, 'noterminate') !== false)->andWhere('t3.status')->ne('terminate')->fi()
             ->andWhere('t1.deleted')->eq(0)
             ->orderBy('t1.date desc, t1.id desc')->fetchAll('id');
 
         /* Set builds and filter terminate releases. */
         $builds = array();
-        foreach($projectBuilds as $buildID => $build) $builds[$buildID] = $build->name;
+        foreach($projectBuilds as $buildID => $build)
+        {
+            if((strpos($params, 'noterminate') !== false) and ($build->releaseStatus === 'terminate')) continue;
+            $builds[$buildID] = $build->name;
+        }
         if(!$builds) return $sysBuilds;
 
         /* if the build has been released, replace build name with release name. */
@@ -113,20 +116,24 @@ class buildModel extends model
         if(strpos($params, 'noempty') === false) $sysBuilds = array('' => '');
         if(strpos($params, 'notrunk') === false) $sysBuilds = $sysBuilds + array('trunk' => 'Trunk');
 
-        $productBuilds = $this->dao->select('t1.id, t1.name, t1.project, t4.name as branchName')->from(TABLE_BUILD)->alias('t1')
+        $productBuilds = $this->dao->select('t1.id, t1.name, t1.project, t2.status as projectStatus, t3.status as releaseStatus, t4.name as branchName')->from(TABLE_BUILD)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->leftJoin(TABLE_RELEASE)->alias('t3')->on('t1.id = t3.build')
             ->leftJoin(TABLE_BRANCH)->alias('t4')->on('t1.branch = t4.id')
             ->where('t1.product')->in($products)
             ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
-            ->beginIF(strpos($params, 'nodone') !== false)->andWhere('t2.status')->ne('none')->fi()
-            ->beginIF(strpos($params, 'noterminate') !== false)->andWhere('t3.status')->ne('terminate')->fi()
             ->andWhere('t1.deleted')->eq(0)
             ->orderBy('t1.date desc, t1.id desc')->fetchAll('id');
 
         /* Set builds and filter done projects and terminate releases. */
         $builds = array();
-        foreach($productBuilds as $key => $build) $builds[$key] = ((strpos($params, 'withbranch') !== false and $build->branchName) ? $build->branchName . '/' : '') . $build->name;
+        foreach($productBuilds as $key => $build)
+        {
+            if((strpos($params, 'nodone')      !== false) and ($build->projectStatus === 'done'))      continue;
+            if((strpos($params, 'noterminate') !== false) and ($build->releaseStatus === 'terminate')) continue;
+            $builds[$key] = ((strpos($params, 'withbranch') !== false and $build->branchName) ? $build->branchName . '/' : '') . $build->name;
+        }
+
         if(!$builds) return $sysBuilds;
 
         /* if the build has been released and replace is true, replace build name with release name. */