diff --git a/Vault.sln b/Vault.sln
index a777de32..2fe5c9b7 100644
--- a/Vault.sln
+++ b/Vault.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vault", "src/Vault/Vault.csproj", "{7999C795-31D4-4E68-A485-BE770C864C40}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vault", "src/Vault/Vault.csproj", "{8F05867B-0A97-4782-B499-106864712700}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vault.Test", "src/Vault.Test/Vault.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
 EndProject
@@ -12,10 +12,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7999C795-31D4-4E68-A485-BE770C864C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7999C795-31D4-4E68-A485-BE770C864C40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7999C795-31D4-4E68-A485-BE770C864C40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7999C795-31D4-4E68-A485-BE770C864C40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F05867B-0A97-4782-B499-106864712700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F05867B-0A97-4782-B499-106864712700}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F05867B-0A97-4782-B499-106864712700}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F05867B-0A97-4782-B499-106864712700}.Release|Any CPU.Build.0 = Release|Any CPU
 		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/generate/templates/libraries/httpclient/api.handlebars b/generate/templates/libraries/httpclient/api.handlebars
index 8757e9b0..85f28d16 100644
--- a/generate/templates/libraries/httpclient/api.handlebars
+++ b/generate/templates/libraries/httpclient/api.handlebars
@@ -219,10 +219,10 @@ namespace {{packageName}}.{{apiPackage}}
             {
                 requestOptions.PathParameters.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}})); // path parameter
             }{{/unless}}{{/each}}
-            {{#each queryParams}}{{#with required}}
+            {{#each queryParams}}{{#eq paramName "list"}}
             requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", "true"));
-            {{/with}}
-            {{#unless required}}
+            {{/eq}}
+            {{#neq paramName "list"}}
             if ({{paramName}} != null)
             {
                 {{#if isDeepObject}}{{#each items.vars}}
@@ -236,7 +236,7 @@ namespace {{packageName}}.{{apiPackage}}
                 {{#unless isDeepObject}}
                 requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}));
                 {{/unless}}
-            }{{/unless}}{{/each}}
+            }{{/neq}}{{/each}}
             {{#each headerParams}}{{#with required}}
             requestOptions.HeaderParameters.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}})); // header parameter
             {{/with}}
diff --git a/src/Vault/Api/Auth.cs b/src/Vault/Api/Auth.cs
index 55e2d1ca..be39198c 100644
--- a/src/Vault/Api/Auth.cs
+++ b/src/Vault/Api/Auth.cs
@@ -28210,14 +28210,9 @@ public VaultResponse<Object> GitHubReadMapTeam(string key, string githubMountPat
                 requestOptions.PathParameters.Add("github_mount_path", ClientUtils.ParameterToString(githubMountPath)); // path parameter
             }
 
+            requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", "true"));
 
-            if (list != null)
-            {
-
-
-                requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", list));
 
-            }
 
 
 
@@ -28485,14 +28480,9 @@ public VaultResponse<Object> GitHubReadMapUser(string key, string githubMountPat
                 requestOptions.PathParameters.Add("github_mount_path", ClientUtils.ParameterToString(githubMountPath)); // path parameter
             }
 
+            requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", "true"));
 
-            if (list != null)
-            {
-
-
-                requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", list));
 
-            }
 
 
 
diff --git a/src/Vault/Api/Secrets.cs b/src/Vault/Api/Secrets.cs
index 9583a79d..6e2ceff3 100644
--- a/src/Vault/Api/Secrets.cs
+++ b/src/Vault/Api/Secrets.cs
@@ -19813,14 +19813,9 @@ public VaultResponse<Object> CubbyholeDelete(string path, string cubbyholeMountP
 
 
 
-
-            if (list != null)
-            {
+            requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", "true"));
 
 
-                requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", list));
-
-            }
 
 
 
@@ -28813,14 +28808,9 @@ public VaultResponse<Object> KVv1Delete(string path, string kvMountPath = "kv",
 
 
 
+            requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", "true"));
 
-            if (list != null)
-            {
-
-
-                requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", list));
 
-            }
 
 
 
@@ -29936,14 +29926,9 @@ public VaultResponse<Object> KVv2ReadConfig(string secretMountPath = "secret", T
                 requestOptions.PathParameters.Add("secret_mount_path", ClientUtils.ParameterToString(secretMountPath)); // path parameter
             }
 
+            requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", "true"));
 
-            if (list != null)
-            {
-
-
-                requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", list));
 
-            }
 
 
 
diff --git a/src/Vault/Api/System.cs b/src/Vault/Api/System.cs
index 107027c0..f0004f82 100644
--- a/src/Vault/Api/System.cs
+++ b/src/Vault/Api/System.cs
@@ -14996,14 +14996,9 @@ public VaultResponse<Object> ReadPluginsCatalogByTypeByName(string name, string
 
 
 
-
-            if (list != null)
-            {
+            requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", "true"));
 
 
-                requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", list));
-
-            }
 
 
 
@@ -15856,14 +15851,9 @@ public VaultResponse<Object> ReadQuotasRateLimit(string name, TimeSpan? wrapTTL
 
 
 
+            requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", "true"));
 
-            if (list != null)
-            {
-
-
-                requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", list));
 
-            }
 
 
 
@@ -15990,14 +15980,9 @@ public VaultResponse<Object> ReadQuotasRateLimit(string name, TimeSpan? wrapTTL
 
 
 
+            requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", "true"));
 
-            if (list != null)
-            {
-
-
-                requestOptions.QueryParameters.Add(ClientUtils.ParameterToMultiMap("", "list", list));
 
-            }