diff --git a/database.inc b/database.inc
index e3a81ed..e408fa3 100644
--- a/database.inc
+++ b/database.inc
@@ -467,22 +467,24 @@ class DatabaseConnection_oracle extends DatabaseConnection
   
   private function escapeReserved($query)
   {
-        $ddl= !((boolean)preg_match('/^(select|insert|update|delete)/i',$query));
-        $search = array ("/({)(\w+)(})/e", // escapes all table names
-                         "/({L#)([0-9]+)(})/e", // escapes long id
-		                 "/(\:)(uid|session|file|access|mode|comment|desc|size|start|end)/e",
-			   	         "/(<uid>|<session>|<file>|<access>|<mode>|<comment>|<desc>|<size>".($ddl?'':'|<date>').")/e",
-			   	         '/([\(\.\s,\=])(uid|session|file|access|mode|comment|desc|size'.($ddl?'':'|date').')([,\s\=)])/e',
-                         '/([\(\.\s,])(uid|session|file|access|mode|comment|desc|size'.($ddl?'':'|date').')$/e');
-
-	    $replace = array ("'\"\\1'.strtoupper('\\2').'\\3\"'",
-				          "'\"\\1'.strtoupper('\\2').'\\3\"'",
-				          "'\\1'.'db_'.'\\2'.'\\3'",
-					      "strtoupper('\"\\1\"')",
-					      "'\\1'.strtoupper('\"\\2\"').'\\3'",
-	                      "'\\1'.strtoupper('\"\\2\"')");
-
-        return preg_replace($search, $replace, $query);  	
+    $ddl= !((boolean)preg_match('/^(select|insert|update|delete)/i',$query));
+    $search = array ("/({)(\w+)(})/e", // escapes all table names
+                     "/({L#)([0-9]+)(})/e", // escapes long id
+                     "/(\:)(uid|session|file|access|mode|comment|desc|size|start|end)/e",
+                     "/(<uid>|<session>|<file>|<access>|<mode>|<comment>|<desc>|<size>".($ddl?'':'|<date>').")/e",
+                     '/([\(\.\s,\=])(uid|session|file|access|mode|comment|desc|size'.($ddl?'':'|date').')([,\s\=)])/e',
+                     '/([\(\.\s,])(uid|session|file|access|mode|comment|desc|size'.($ddl?'':'|date').')$/e',
+                     '/(\=)(uid)(\s)/e');
+
+    $replace = array ("'\"\\1'.strtoupper('\\2').'\\3\"'",
+                      "'\"\\1'.strtoupper('\\2').'\\3\"'",
+                      "'\\1'.'db_'.'\\2'.'\\3'",
+                      "strtoupper('\"\\1\"')",
+                      "'\\1'.strtoupper('\"\\2\"').'\\3'",
+                      "'\\1'.strtoupper('\"\\2\"')",
+                      "'\\1'.strtoupper('\"\\2\"')");
+
+    return preg_replace($search, $replace, $query);     
   }