diff --git a/docs/spec/api.md b/docs/spec/api.md
index 9bbd37d9..60ce1864 100644
--- a/docs/spec/api.md
+++ b/docs/spec/api.md
@@ -1264,7 +1264,7 @@ The error codes that may be included in the response body are enumerated below:
 ##### Tags Paginated
 
 ```
-GET /v2/<name>/tags/list?n=<integer>last=<integer>
+GET /v2/<name>/tags/list?n=<integer>&last=<integer>
 ```
 
 Return a portion of the tags for the specified repository.
@@ -3273,7 +3273,7 @@ The following headers will be returned with the response:
 ##### Catalog Fetch Paginated
 
 ```
-GET /v2/_catalog?n=<integer>last=<integer>
+GET /v2/_catalog?n=<integer>&last=<integer>
 ```
 
 Return the specified portion of repositories.
diff --git a/docs/spec/api.md.tmpl b/docs/spec/api.md.tmpl
index c760f179..de2f5a90 100644
--- a/docs/spec/api.md.tmpl
+++ b/docs/spec/api.md.tmpl
@@ -1041,7 +1041,7 @@ The error codes encountered via the API are enumerated in the following table:
 ##### {{.Name}}{{end}}
 
 ```
-{{$method.Method}} {{$route.Path|prettygorilla}}{{if .QueryParameters}}?{{range .QueryParameters}}{{.Name}}={{.Format}}{{end}}{{end}}{{range .Headers}}
+{{$method.Method}} {{$route.Path|prettygorilla}}{{range $i, $param := .QueryParameters}}{{if eq $i 0}}?{{else}}&{{end}}{{$param.Name}}={{$param.Format}}{{end}}{{range .Headers}}
 {{.Name}}: {{.Format}}{{end}}{{if .Body.ContentType}}
 Content-Type: {{.Body.ContentType}}{{end}}{{if .Body.Format}}