--- trunk/vhost/webpac2.cgi	2010/03/04 22:26:06	1328
+++ trunk/vhost/webpac2.cgi	2010/03/08 17:28:02	1329
@@ -217,7 +217,7 @@
 	my @attrs = param('attr');
 	my $op = param('attr_operator');
 
-	if ( $search =~ m{(=|"|AND|OR)} ) {
+	if ( $search =~ m{(=|"|\bAND\b|\bOR\b)} ) {
 		push @search, $search;
 	} elsif ( @attrs ) {