2 files changed, 7 insertions, 5 deletions
diff --git a/CGI.pl b/CGI.pl
index a1ced72ea..71ed43e1c 100644
--- a/CGI.pl
+++ b/CGI.pl
@@ -1075,11 +1075,12 @@ sub GetCommandMenu {
             my $mybugsurl = PerformSubsts($mybugstemplate, \%substs);
             $html = $html . " | <A HREF='$mybugsurl'><NOBR>My bugs</NOBR></A>";
         }
-        SendSQL("SELECT name,query FROM namedqueries " .
+        SendSQL("SELECT name FROM namedqueries " .
                 "WHERE userid = $userid AND linkinfooter");
         while (MoreSQLData()) {
-            my ($name, $query) = (FetchSQLData());
-            $html .= qq{ | <A HREF="buglist.cgi?$query"><NOBR>$name</NOBR></A>};
+            my ($name) = (FetchSQLData());
+            $html .= " | <A HREF=\"buglist.cgi?&cmdtype=runnamed&namedcmd=" .
+                     url_quote($name) . "\"><NOBR>$name</NOBR></A>";
         }
         $html .= " | <NOBR>Edit <a href='userprefs.cgi'>prefs</a></NOBR>";
         if (UserInGroup("tweakparams")) {
diff --git a/buglist.cgi b/buglist.cgi
index 360deefff..a7a3e72fe 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -662,11 +662,12 @@ sub LookupNamedQuery {
 
 
         
-
+$::querytitle = "Bug List";
 
 CMD: for ($::FORM{'cmdtype'}) {
     /^runnamed$/ && do {
         $::buffer = LookupNamedQuery($::FORM{"namedcmd"});
+        $::querytitle = "Bug List: $::FORM{'namedcmd'}";
         ProcessFormFields($::buffer);
         last CMD;
     };
@@ -1155,7 +1156,7 @@ if (length($buglist) < 4000) {
     print "Set-Cookie: BUGLIST=\n\n";
     $toolong = 1;
 }
-PutHeader("Bug List");
+PutHeader($::querytitle);
 
 
 print "