diff --git a/module/program/model.php b/module/program/model.php
index caf71c1072..93c3935060 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -547,6 +547,29 @@ class programModel extends model
             $path    = $program->path;
         }
 
+        if($queryID)
+        {
+            $query = $this->loadModel('search')->getQuery($queryID);
+            if($query)
+            {
+                $this->session->set('projectQuery', $query->sql);
+                $this->session->set('projectForm', $query->form);
+            }
+            else
+            {
+                $this->session->set('projectQuery', ' 1 = 1');
+            }
+        }
+        else
+        {
+            if($this->session->projectQuery == false) $this->session->set('projectQuery', ' 1 = 1');
+        }
+
+        if(isset($this->config->setCode) and $this->config->setCode == 0)
+        {
+            $this->session->projectQuery = preg_replace("/`code`.*'  [)] (AND|OR) \( 1  AND `/", '1 ) $1 ( 1  AND `', $this->session->projectQuery);
+        }
+
         $query       = str_replace('`id`','t1.id', $this->session->projectQuery);
         $projectList = $this->dao->select('distinct t1.*')->from(TABLE_PROJECT)->alias('t1')
             ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')
diff --git a/module/project/config.php b/module/project/config.php
index c75ee66c9e..2e7a9498b8 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -155,7 +155,7 @@ $config->project->search['fields']['lastEditedDate'] = $lang->project->lastEdite
 $config->project->search['fields']['closedDate']     = $lang->project->closedDate;
 
 $config->project->search['params']['name']           = array('operator' => 'include', 'control' => 'input' , 'values' => '');
-$config->project->search['params']['code']           = array('operator' => '='      , 'control' => 'input' , 'values' => '');
+if(!isset($config->setCode) or $config->setCode == 1) $config->project->search['params']['code'] = array('operator' => '='      , 'control' => 'input' , 'values' => '');
 $config->project->search['params']['id']             = array('operator' => '='      , 'control' => 'input' , 'values' => '');
 $config->project->search['params']['model']          = array('operator' => '='      , 'control' => 'select', 'values' => $lang->project->modelList);
 $config->project->search['params']['parent']         = array('operator' => '='      , 'control' => 'select', 'values' => '');