diff --git a/etemplate/inc/class.so_sql.inc.php b/etemplate/inc/class.so_sql.inc.php
index 3068dd14a6..c013cfe0b1 100644
--- a/etemplate/inc/class.so_sql.inc.php
+++ b/etemplate/inc/class.so_sql.inc.php
@@ -1089,15 +1089,15 @@ class so_sql
 
 		while($token)
 		{
-			if($token == strtoupper(lang('AND')))
+			if($token == strtoupper(lang('AND')) || $token == 'AND')
 			{
 				$token = '+'.strtok($break);
 			}
-			elseif ($token == strtoupper(lang('OR')))
+			elseif ($token == strtoupper(lang('OR')) || $token == 'OR')
 			{
 				continue;
 			}
-			elseif ($token == strtoupper(lang('NOT')))
+			elseif ($token == strtoupper(lang('NOT')) || $token == 'NOT')
 			{
 				$token = '-'.strtok($break);
 			}