diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
index 8c2b257fcbf..1d98a35daa1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
@@ -36,18 +36,6 @@
           "type" : "string",
           "description" : "The field to use as default where no field prefix is given in the query string"
         },
-        "explain": {
-          "type" : "boolean",
-          "description" : "Specify whether to return detailed information about score computation as part of a hit"
-        },
-        "stored_fields": {
-          "type" : "list",
-          "description" : "A comma-separated list of stored fields to return as part of a hit"
-        },
-        "docvalue_fields": {
-          "type" : "list",
-          "description" : "A comma-separated list of fields to return as the docvalue representation of a field for each hit"
-        },
         "from": {
           "type" : "number",
           "description" : "Starting offset (default: 0)"
@@ -134,32 +122,10 @@
           "type" : "list",
           "description" : "Specific 'tag' of the request for logging and statistical purposes"
         },
-        "suggest_field": {
-          "type" : "string",
-          "description" : "Specify which field to use for suggestions"
-        },
-        "suggest_mode": {
-          "type" : "enum",
-          "options" : ["missing", "popular", "always"],
-          "default" : "missing",
-          "description" : "Specify suggest mode"
-        },
-        "suggest_size": {
-          "type" : "number",
-          "description" : "How many suggestions to return in response"
-        },
-        "suggest_text": {
-          "type" : "string",
-          "description" : "The source text for which the suggestions should be returned"
-        },
         "timeout": {
           "type" : "time",
           "description" : "Explicit operation timeout"
         },
-        "track_scores": {
-          "type" : "boolean",
-          "description": "Whether to calculate and return scores even if they are not used for sorting"
-        },
         "version": {
           "type" : "boolean",
           "description" : "Specify whether to return document version as part of a hit"
@@ -194,7 +160,7 @@
         "requests_per_second": {
           "type": "number",
           "default": 0,
-          "description": "The throttle for this request in sub-requests per second. -1 means set no throttle."
+          "description": "The throttle to set on this request in sub-requests per second. -1 means set no throttle as does \"unlimited\" which is the only non-float this accepts."
         }
       }
     },
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json
index 3974eaae88d..1cc89f1472d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json
@@ -36,22 +36,6 @@
           "type" : "string",
           "description" : "The field to use as default where no field prefix is given in the query string"
         },
-        "explain": {
-          "type" : "boolean",
-          "description" : "Specify whether to return detailed information about score computation as part of a hit"
-        },
-        "stored_fields": {
-          "type" : "list",
-          "description" : "A comma-separated list of stored fields to return as part of a hit"
-        },
-        "docvalue_fields": {
-          "type" : "list",
-          "description" : "A comma-separated list of fields to return as the docvalue representation of a field for each hit"
-        },
-        "fielddata_fields": {
-          "type" : "list",
-          "description" : "A comma-separated list of fields to return as the docvalue representation of a field for each hit"
-        },
         "from": {
           "type" : "number",
           "description" : "Starting offset (default: 0)"
@@ -69,7 +53,7 @@
             "type" : "enum",
             "options": ["abort", "proceed"],
             "default": "abort",
-            "description" : "What to do when the reindex hits version conflicts?"
+            "description" : "What to do when the update by query hits version conflicts?"
         },
         "expand_wildcards": {
             "type" : "enum",
@@ -142,32 +126,10 @@
           "type" : "list",
           "description" : "Specific 'tag' of the request for logging and statistical purposes"
         },
-        "suggest_field": {
-          "type" : "string",
-          "description" : "Specify which field to use for suggestions"
-        },
-        "suggest_mode": {
-          "type" : "enum",
-          "options" : ["missing", "popular", "always"],
-          "default" : "missing",
-          "description" : "Specify suggest mode"
-        },
-        "suggest_size": {
-          "type" : "number",
-          "description" : "How many suggestions to return in response"
-        },
-        "suggest_text": {
-          "type" : "string",
-          "description" : "The source text for which the suggestions should be returned"
-        },
         "timeout": {
           "type" : "time",
           "description" : "Explicit operation timeout"
         },
-        "track_scores": {
-          "type" : "boolean",
-          "description": "Whether to calculate and return scores even if they are not used for sorting"
-        },
         "version": {
           "type" : "boolean",
           "description" : "Specify whether to return document version as part of a hit"
@@ -201,7 +163,7 @@
         "wait_for_completion": {
            "type" : "boolean",
            "default": false,
-           "description" : "Should the request should block until the reindex is complete."
+           "description" : "Should the request should block until the update by query operation is complete."
         },
         "requests_per_second": {
           "type": "number",