diff --git a/module/bug/config/search.php b/module/bug/config/search.php
index 462805a0f8..3013c767cc 100644
--- a/module/bug/config/search.php
+++ b/module/bug/config/search.php
@@ -35,8 +35,13 @@ $config->bug->search['fields']['openedBy']       = $lang->bug->openedBy;
 $config->bug->search['fields']['closedBy']       = $lang->bug->closedBy;
 $config->bug->search['fields']['lastEditedBy']   = $lang->bug->abbr->lastEditedBy;
 
-$config->bug->search['fields']['mailto']         = $lang->bug->mailto;
+if(in_array($config->edition, array('max', 'ipd')))
+{
+    $config->bug->search['fields']['injection']    = $lang->bug->injection;
+    $config->bug->search['fields']['identify']     = $lang->bug->identify;
+}
 
+$config->bug->search['fields']['mailto']         = $lang->bug->mailto;
 $config->bug->search['fields']['openedBuild']    = $lang->bug->openedBuild;
 $config->bug->search['fields']['resolvedBuild']  = $lang->bug->resolvedBuild;
 
@@ -76,6 +81,13 @@ $config->bug->search['params']['toStory']       = array('operator' => '=',
 $config->bug->search['params']['openedBy']      = array('operator' => '=',       'control' => 'select', 'values' => 'users');
 $config->bug->search['params']['closedBy']      = array('operator' => '=',       'control' => 'select', 'values' => 'users');
 $config->bug->search['params']['lastEditedBy']  = array('operator' => '=',       'control' => 'select', 'values' => 'users');
+
+if(in_array($config->edition, array('max', 'ipd')))
+{
+    $config->bug->search['params']['injection']   = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->injectionList);
+    $config->bug->search['params']['identify']    = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->identifyList);
+}
+
 $config->bug->search['params']['mailto']        = array('operator' => 'include', 'control' => 'select', 'values' => 'users');
 $config->bug->search['params']['openedBuild']   = array('operator' => 'include', 'control' => 'select', 'values' => 'builds');
 $config->bug->search['params']['resolvedBuild'] = array('operator' => '=',       'control' => 'select', 'values' => 'builds');
@@ -86,4 +98,3 @@ $config->bug->search['params']['closedDate']    = array('operator' => '=',
 $config->bug->search['params']['lastEditedDate']= array('operator' => '=',       'control' => 'date',  'values' => '');
 $config->bug->search['params']['deadline']      = array('operator' => '=',       'control' => 'date',  'values' => '');
 $config->bug->search['params']['activatedDate'] = array('operator' => '=',       'control' => 'date',  'values' => '');
-
diff --git a/module/bug/config/table.php b/module/bug/config/table.php
index 1cb3686024..89ae83a379 100644
--- a/module/bug/config/table.php
+++ b/module/bug/config/table.php
@@ -164,19 +164,6 @@ $config->bug->dtable->fieldList['browser']['group']    = 7;
 $config->bug->dtable->fieldList['browser']['control']  = 'multiple';
 $config->bug->dtable->fieldList['browser']['sortType'] = true;
 
-if(in_array($config->edition, array('max', 'ipd')))
-{
-    $config->bug->dtable->fieldList['injection']['title']   = $lang->bug->injection;
-    $config->bug->dtable->fieldList['injection']['control'] = 'picker';
-    $config->bug->dtable->fieldList['injection']['type']    = 'text';
-    $config->bug->dtable->fieldList['injection']['map']     = $lang->bug->injectionList;
-
-    $config->bug->dtable->fieldList['identify']['title']   = $lang->bug->identify;
-    $config->bug->dtable->fieldList['identify']['control'] = 'picker';
-    $config->bug->dtable->fieldList['identify']['type']    = 'text';
-    $config->bug->dtable->fieldList['identify']['map']     = $lang->bug->identifyList;
-}
-
 $config->bug->dtable->fieldList['activatedCount']['title']    = $lang->bug->abbr->activatedCount;
 $config->bug->dtable->fieldList['activatedCount']['type']     = 'count';
 $config->bug->dtable->fieldList['activatedCount']['group']    = 8;
@@ -223,6 +210,19 @@ $config->bug->dtable->fieldList['mailto']['group']     = 9;
 $config->bug->dtable->fieldList['mailto']['sortType']  = true;
 $config->bug->dtable->fieldList['mailto']['delimiter'] = ',';
 
+if(in_array($config->edition, array('max', 'ipd')))
+{
+    $config->bug->dtable->fieldList['injection']['title']   = $lang->bug->injection;
+    $config->bug->dtable->fieldList['injection']['control'] = 'picker';
+    $config->bug->dtable->fieldList['injection']['type']    = 'text';
+    $config->bug->dtable->fieldList['injection']['map']     = $lang->bug->injectionList;
+
+    $config->bug->dtable->fieldList['identify']['title']   = $lang->bug->identify;
+    $config->bug->dtable->fieldList['identify']['control'] = 'picker';
+    $config->bug->dtable->fieldList['identify']['type']    = 'text';
+    $config->bug->dtable->fieldList['identify']['map']     = $lang->bug->identifyList;
+}
+
 $config->bug->dtable->fieldList['keywords']['title']    = $lang->bug->keywords;
 $config->bug->dtable->fieldList['keywords']['type']     = 'text';
 $config->bug->dtable->fieldList['keywords']['group']    = 9;