diff --git a/src/ApiGenerator/RestSpecification/Core/msearch.json b/src/ApiGenerator/RestSpecification/Core/msearch.json
index 0dde4206ecf..359d1e67b07 100644
--- a/src/ApiGenerator/RestSpecification/Core/msearch.json
+++ b/src/ApiGenerator/RestSpecification/Core/msearch.json
@@ -39,9 +39,7 @@
         "type":"enum",
         "options":[
           "query_then_fetch",
-          "query_and_fetch",
-          "dfs_query_then_fetch",
-          "dfs_query_and_fetch"
+          "dfs_query_then_fetch"
         ],
         "description":"Search operation type"
       },
diff --git a/src/ApiGenerator/RestSpecification/Core/msearch_template.json b/src/ApiGenerator/RestSpecification/Core/msearch_template.json
index 72b899c13c6..38b1d5b6add 100644
--- a/src/ApiGenerator/RestSpecification/Core/msearch_template.json
+++ b/src/ApiGenerator/RestSpecification/Core/msearch_template.json
@@ -39,9 +39,7 @@
         "type":"enum",
         "options":[
           "query_then_fetch",
-          "query_and_fetch",
-          "dfs_query_then_fetch",
-          "dfs_query_and_fetch"
+          "dfs_query_then_fetch"
         ],
         "description":"Search operation type"
       },
diff --git a/src/ApiGenerator/RestSpecification/Core/search_template.json b/src/ApiGenerator/RestSpecification/Core/search_template.json
index 82d7eb76103..22a2a8367bc 100644
--- a/src/ApiGenerator/RestSpecification/Core/search_template.json
+++ b/src/ApiGenerator/RestSpecification/Core/search_template.json
@@ -75,9 +75,7 @@
         "type":"enum",
         "options":[
           "query_then_fetch",
-          "query_and_fetch",
-          "dfs_query_then_fetch",
-          "dfs_query_and_fetch"
+          "dfs_query_then_fetch"
         ],
         "description":"Search operation type"
       },