--- trunk/WebPac.pm	2003/09/02 21:31:54	121
+++ trunk/WebPac.pm	2003/09/03 23:07:21	124
@@ -108,7 +108,7 @@
 					$s.= ($s) ? "and " : "";
 					$s.="not " if ($1 eq "-");
 					$s.="$2* ";
-				} elsif (m/(and|or|not)/i) {
+				} elsif (m/^\s*(and|or|not)\s*$/i) {
 					$s.="$_ ";
 				# don't add * to words with less than x chars
 				} elsif (length($_) <= $MIN_WILDCARD) {
@@ -237,7 +237,7 @@
 		return $html;
 	}
 
-	my $tmpl = $self->load_tmpl('index_res.html');
+	my $tmpl = $self->load_tmpl('index_res.html', global_vars => 1);
 	$tmpl->param('field',$field);
 	$tmpl->param('limit',$limit);
 	$tmpl->param('total',$total);