diff --git a/api.go b/api.go
index bf7c69b..a218c51 100644
--- a/api.go
+++ b/api.go
@@ -121,10 +121,10 @@ func UrlEncode(s any) string {
 			} else {
 				rv += "?"
 			}
-			rv += fmt.Sprintf("%s=%s", tag.FieldName, fmt.Sprint(val))
+			rv += fmt.Sprintf("%s=%s", tag.FieldName, url.QueryEscape(fmt.Sprint(val)))
 			rvCount++
 		}
 
 	}
-	return url.QueryEscape(rv)
+	return rv
 }