diff --git a/inc/actions.php b/inc/actions.php
index 315e35da85f84ad67582dd0a83bab267d5e1550f..eb43bb13fe60b85fb48303ee48d232e14afadb49 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -27,7 +27,8 @@ function act_dispatch(){
   $ACT = act_clean($ACT);
 
   //check if searchword was given - else just show
-  if($ACT == 'search' && empty($QUERY)){
+  $s = cleanID($QUERY);
+  if($ACT == 'search' && empty($s)){
     $ACT = 'show';
   }
 
diff --git a/inc/pageutils.php b/inc/pageutils.php
index a6432619deefeabae5bb0ace663c71b6eddbd4d8..73be0a3a813eb814980cb2bc9e7c1b1da1b3f402 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -52,8 +52,8 @@ function getID($param='id',$clean=true){
     //strip leading slashes
     $id = preg_replace('!^/+!','',$id);
   }
-  if(empty($id) && $param=='id') $id = $conf['start'];
   if($clean) $id = cleanID($id);
+  if(empty($id) && $param=='id') $id = $conf['start'];
   
   return $id;
 }