diff --git a/cmd/dcs-web/common/common.go b/cmd/dcs-web/common/common.go
index d34a955..f483f4a 100644
--- a/cmd/dcs-web/common/common.go
+++ b/cmd/dcs-web/common/common.go
@@ -8,6 +8,7 @@ import (
 	"html/template"
 	"io/ioutil"
 	"log"
+	"net/url"
 	"path/filepath"
 	"reflect"
 	"strings"
@@ -53,6 +54,17 @@ func Init(tlsCertPath, tlsKeyPath, staticPath string) {
 func loadTemplates() {
 	var err error
 	Templates = template.New("foo").Funcs(template.FuncMap{
+		"appendToQuery": func(unparsedURL, extra string) string {
+			u, err := url.Parse(unparsedURL)
+			if err != nil {
+				log.Printf("appendToQuery(%q) = %v", unparsedURL, err)
+				return unparsedURL
+			}
+			basequery := u.Query()
+			basequery.Set("q", basequery.Get("q")+extra)
+			u.RawQuery = basequery.Encode()
+			return u.String()
+		},
 		"eq": func(args ...interface{}) bool {
 			if len(args) == 0 {
 				return false
diff --git a/cmd/dcs-web/serverrendered.go b/cmd/dcs-web/serverrendered.go
index 7c95bdd..6e76d78 100644
--- a/cmd/dcs-web/serverrendered.go
+++ b/cmd/dcs-web/serverrendered.go
@@ -178,7 +178,6 @@ func renderPerPackage(w http.ResponseWriter, r *http.Request, queryid string, pa
 	pagination := updatePagination(page, pages, baseurl.String())
 
 	basequery.Del("perpkg")
-	basequery.Del("q")
 	// Ensure the filterurl has at least one parameter, so that we can
 	// always concatenate with the & sign.
 	basequery.Set("_", "_")
@@ -331,7 +330,6 @@ func Search(w http.ResponseWriter, r *http.Request) {
 	perpkgurl := baseurl.String()
 
 	basequery.Del("perpkg")
-	basequery.Del("q")
 	// Ensure the filterurl has at least one parameter, so that we can
 	// always concatenate with the & sign.
 	basequery.Set("_", "_")
diff --git a/cmd/dcs-web/templates/perpackage-results.html b/cmd/dcs-web/templates/perpackage-results.html
index 09f42d9..2b22943 100644
--- a/cmd/dcs-web/templates/perpackage-results.html
+++ b/cmd/dcs-web/templates/perpackage-results.html
@@ -92,7 +92,7 @@ <h2>Search Results by package for "{{.q}}"</h2>
 <p>
 <strong>Filter by package:</strong>
 {{range $index, $package := .packages}}
-<a href="{{$.filterurl}}&q={{$.q}}+package:{{$package}}">{{$package}}</a>,
+<a href="{{ appendToQuery $.filterurl (printf " package:%s" $package ) }}">{{$package}}</a>,
 {{end}}
 </p>
 
diff --git a/cmd/dcs-web/templates/results.html b/cmd/dcs-web/templates/results.html
index 2e759ff..b15e511 100644
--- a/cmd/dcs-web/templates/results.html
+++ b/cmd/dcs-web/templates/results.html
@@ -95,7 +95,7 @@ <h2>Search Results for "{{.q}}"</h2>
 <p>
 <strong>Filter by package:</strong>
 {{range $index, $package := .packages}}
-<a href="{{$.filterurl}}&q={{$.q}}+package:{{$package}}">{{$package}}</a>,
+<a href="{{ appendToQuery $.filterurl (printf " package:%s" $package ) }}">{{$package}}</a>,
 {{end}}
 </p>