diff --git a/includes/common.inc b/includes/common.inc
index a602653140473124efe3033f595e586d92721a8a..910174e191ec67ca7fa12286485a41d37b0aae1f 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -339,7 +339,7 @@ function search_item($item, $type) {
  * @param $options != 0: Render additional form fields/text
  *                 ("Restrict search to", help text, etc).
  */
-function search_form($action = 0, $keys = 0, $options = 0) {
+function search_form($action = NULL, $keys = NULL, $options = NULL) {
 
   if (!$action) {
     $action = url("search");
@@ -400,11 +400,9 @@ function search_data($keys = NULL) {
  * @param $options != 0: Render additional form fields/text
  *                 ("Restrict search to", help text, etc).
  */
-function search_type($type = 0, $action = 0, $keys = 0, $options = 0) {
+function search_type($type, $action = NULL, $keys = NULL, $options = NULL) {
 
-  if (isset($type)) {
-    $_POST["edit"]["type"][$type] = "on";
-  }
+  $_POST["edit"]["type"][$type] = "on";
 
   return search_form($action, $keys, $options) . "<br />". search_data($keys);
 }
diff --git a/modules/comment.module b/modules/comment.module
index d6f201e8c9bd24cfa818434ca70eafb177cbffee..f6d65185b68e0cbd247a22a3437b579a1336e8c9 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -1066,7 +1066,7 @@ function comment_admin() {
         print comment_admin_edit(arg(3));
         break;
       case "search":
-        print search_type("comment", url("admin/comment/search"));
+        print search_type("comment", url("admin/comment/search"), $_POST["keys"]);
         break;
       case "votes":
       case t("Add new vote"):
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index d6f201e8c9bd24cfa818434ca70eafb177cbffee..f6d65185b68e0cbd247a22a3437b579a1336e8c9 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1066,7 +1066,7 @@ function comment_admin() {
         print comment_admin_edit(arg(3));
         break;
       case "search":
-        print search_type("comment", url("admin/comment/search"));
+        print search_type("comment", url("admin/comment/search"), $_POST["keys"]);
         break;
       case "votes":
       case t("Add new vote"):
diff --git a/modules/node.module b/modules/node.module
index ccdd264baa5853cb2fcfff96e2b481557991b1a4..3d1bc04e9aa5d333a5d9a86ba6631386a3d2abc3 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -797,7 +797,7 @@ function node_admin() {
     */
     switch ($op) {
       case "search":
-        print search_type("node", url("admin/node/search"));
+        print search_type("node", url("admin/node/search"), $_POST["keys"]);
         break;
       case "edit":
         print node_admin_edit(arg(3));
diff --git a/modules/node/node.module b/modules/node/node.module
index ccdd264baa5853cb2fcfff96e2b481557991b1a4..3d1bc04e9aa5d333a5d9a86ba6631386a3d2abc3 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -797,7 +797,7 @@ function node_admin() {
     */
     switch ($op) {
       case "search":
-        print search_type("node", url("admin/node/search"));
+        print search_type("node", url("admin/node/search"), $_POST["keys"]);
         break;
       case "edit":
         print node_admin_edit(arg(3));
diff --git a/modules/user.module b/modules/user.module
index fbba36e143e206402793368088f52c35fe0e331c..4f3387e9f6d1675ac44e88074b719cb6fe5336cd 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1635,7 +1635,7 @@ function user_admin() {
 
     switch ($op) {
       case "search":
-        print search_type("user", url("admin/user/search"));
+        print search_type("user", url("admin/user/search"), $_POST["keys"]);
         break;
       case t("Add rule"):
       case t("Check"):
diff --git a/modules/user/user.module b/modules/user/user.module
index fbba36e143e206402793368088f52c35fe0e331c..4f3387e9f6d1675ac44e88074b719cb6fe5336cd 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1635,7 +1635,7 @@ function user_admin() {
 
     switch ($op) {
       case "search":
-        print search_type("user", url("admin/user/search"));
+        print search_type("user", url("admin/user/search"), $_POST["keys"]);
         break;
       case t("Add rule"):
       case t("Check"):