--- trunk/WebPac.pm	2005/02/21 22:21:53	675
+++ trunk/WebPac.pm	2005/03/01 19:30:55	686
@@ -186,6 +186,7 @@
 	foreach my $v (@persist_vars) {
 		foreach my $val ($q->param($v)) {
 			next if (! $val || $val eq '');
+			$val =~ s/"/&quote;/g;
 			$hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n";
 			$hidden_search .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n" if ($v ne "rm");
 		}
@@ -227,6 +228,12 @@
 
 	my $q = $self->query();
 
+	# submit was reset?
+	if ($q->param('reset')) {
+		$q->delete_all;
+		return $self->show_search_form();
+	}
+
 	# load template for this page
 
 	my @s_arr;	# all queries are located here
@@ -267,6 +274,8 @@
 		push @url_params_persist,"f$i=".$q->url_param("f$i") if ($persist);
 
 		foreach my $v ($q->url_param("v$i")) {
+			# escape quotes so that phrase search work
+			$v =~ s/"/%22/g;
 			push @url_params,"v$i=$v";
 			push @url_params_persist,"v$i=$v" if ($persist);
 		}
@@ -476,6 +485,7 @@
 	$tmpl->param('field',$field);
 	$tmpl->param('limit',$limit);
 	$tmpl->param('total',$total);
+	$tmpl->param('filter',$filter);
 
 # FIXME I should set offset and leave out limit from fetch!!
 #	if (! $q->param("PAGER_offset") {