diff --git a/pkg/tags/tags.go b/pkg/tags/tags.go
index 65ba38b102..d7c65af5a0 100644
--- a/pkg/tags/tags.go
+++ b/pkg/tags/tags.go
@@ -136,12 +136,11 @@ type tagSet struct {
 }
 
 func (tags tagSet) String() string {
-	s := []string{}
+	vals := make(url.Values)
 	for key, value := range tags.tagMap {
-		s = append(s, key+"="+value)
+		vals.Set(key, value)
 	}
-
-	return strings.Join(s, "&")
+	return vals.Encode()
 }
 
 func (tags *tagSet) remove(key string) {