diff --git a/docs/api_methods.asciidoc b/docs/api_methods.asciidoc
index 28da437b5..baa015563 100644
--- a/docs/api_methods.asciidoc
+++ b/docs/api_methods.asciidoc
@@ -1216,7 +1216,7 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 client.msearch({
   body: [
     // match all query, on all indices and types
-    {},
+    {}
     { query: { match_all: {} } },
 
     // query_string query, on index/mytype
diff --git a/docs/api_methods_0_90.asciidoc b/docs/api_methods_0_90.asciidoc
index fbf229462..4f9830509 100644
--- a/docs/api_methods_0_90.asciidoc
+++ b/docs/api_methods_0_90.asciidoc
@@ -905,7 +905,7 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 client.msearch({
   body: [
     // match all query, on all indices and types
-    {},
+    {}
     { query: { match_all: {} } },
 
     // query_string query, on index/mytype
diff --git a/docs/api_methods_1_0.asciidoc b/docs/api_methods_1_0.asciidoc
index d7652ab16..1251e1408 100644
--- a/docs/api_methods_1_0.asciidoc
+++ b/docs/api_methods_1_0.asciidoc
@@ -1007,7 +1007,7 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 client.msearch({
   body: [
     // match all query, on all indices and types
-    {},
+    {}
     { query: { match_all: {} } },
 
     // query_string query, on index/mytype
diff --git a/docs/api_methods_1_1.asciidoc b/docs/api_methods_1_1.asciidoc
index cab1339a3..040c65815 100644
--- a/docs/api_methods_1_1.asciidoc
+++ b/docs/api_methods_1_1.asciidoc
@@ -1019,7 +1019,7 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 client.msearch({
   body: [
     // match all query, on all indices and types
-    {},
+    {}
     { query: { match_all: {} } },
 
     // query_string query, on index/mytype
diff --git a/docs/api_methods_1_2.asciidoc b/docs/api_methods_1_2.asciidoc
index 498fe44c1..c70f040ff 100644
--- a/docs/api_methods_1_2.asciidoc
+++ b/docs/api_methods_1_2.asciidoc
@@ -1019,7 +1019,7 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 client.msearch({
   body: [
     // match all query, on all indices and types
-    {},
+    {}
     { query: { match_all: {} } },
 
     // query_string query, on index/mytype
diff --git a/docs/api_methods_1_3.asciidoc b/docs/api_methods_1_3.asciidoc
index d18a971f3..4a1f25af4 100644
--- a/docs/api_methods_1_3.asciidoc
+++ b/docs/api_methods_1_3.asciidoc
@@ -1115,7 +1115,7 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 client.msearch({
   body: [
     // match all query, on all indices and types
-    {},
+    {}
     { query: { match_all: {} } },
 
     // query_string query, on index/mytype
diff --git a/docs/api_methods_1_4.asciidoc b/docs/api_methods_1_4.asciidoc
index f9329dd12..8076cdbea 100644
--- a/docs/api_methods_1_4.asciidoc
+++ b/docs/api_methods_1_4.asciidoc
@@ -1169,7 +1169,7 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 client.msearch({
   body: [
     // match all query, on all indices and types
-    {},
+    {}
     { query: { match_all: {} } },
 
     // query_string query, on index/mytype
diff --git a/docs/api_methods_1_5.asciidoc b/docs/api_methods_1_5.asciidoc
index d5a2de83d..6dddcc83e 100644
--- a/docs/api_methods_1_5.asciidoc
+++ b/docs/api_methods_1_5.asciidoc
@@ -1169,7 +1169,7 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 client.msearch({
   body: [
     // match all query, on all indices and types
-    {},
+    {}
     { query: { match_all: {} } },
 
     // query_string query, on index/mytype
diff --git a/src/lib/apis/1_6.js b/src/lib/apis/1_6.js
index 6722812eb..fb5a5f51e 100644
--- a/src/lib/apis/1_6.js
+++ b/src/lib/apis/1_6.js
@@ -5805,7 +5805,17 @@ api.snapshot.prototype.create = ca({
       name: 'wait_for_completion'
     }
   },
-  url: {},
+  url: {
+    fmt: '/_snapshot/<%=repository%>/<%=snapshot%>/_create',
+    req: {
+      repository: {
+        type: 'string'
+      },
+      snapshot: {
+        type: 'string'
+      }
+    }
+  },
   method: 'POST'
 });
 
diff --git a/src/lib/apis/1_x.js b/src/lib/apis/1_x.js
index 6722812eb..fb5a5f51e 100644
--- a/src/lib/apis/1_x.js
+++ b/src/lib/apis/1_x.js
@@ -5805,7 +5805,17 @@ api.snapshot.prototype.create = ca({
       name: 'wait_for_completion'
     }
   },
-  url: {},
+  url: {
+    fmt: '/_snapshot/<%=repository%>/<%=snapshot%>/_create',
+    req: {
+      repository: {
+        type: 'string'
+      },
+      snapshot: {
+        type: 'string'
+      }
+    }
+  },
   method: 'POST'
 });
 
diff --git a/src/lib/apis/master.js b/src/lib/apis/master.js
index 01a9067b0..3e72a050b 100644
--- a/src/lib/apis/master.js
+++ b/src/lib/apis/master.js
@@ -2033,13 +2033,14 @@ api.indices.prototype.analyze = ca({
  * @param {Boolean} params.fieldData - Clear field data
  * @param {Boolean} params.fielddata - Clear field data
  * @param {String, String[], Boolean} params.fields - A comma-separated list of fields to clear when using the `field_data` parameter (default: all)
- * @param {Boolean} params.query - Clear query caches
+ * @param {Boolean} params.filter - Clear filter caches
+ * @param {Boolean} params.filterCache - Clear filter caches
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
  * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
  * @param {String} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
  * @param {String, String[], Boolean} params.index - A comma-separated list of index name to limit the operation
  * @param {Boolean} params.recycler - Clear the recycler cache
- * @param {Boolean} params.request - Clear request cache
+ * @param {Boolean} params.queryCache - Clear query cache
  */
 api.indices.prototype.clearCache = ca({
   params: {
@@ -2053,9 +2054,13 @@ api.indices.prototype.clearCache = ca({
     fields: {
       type: 'list'
     },
-    query: {
+    filter: {
       type: 'boolean'
     },
+    filterCache: {
+      type: 'boolean',
+      name: 'filter_cache'
+    },
     ignoreUnavailable: {
       type: 'boolean',
       name: 'ignore_unavailable'
@@ -2081,8 +2086,9 @@ api.indices.prototype.clearCache = ca({
     recycler: {
       type: 'boolean'
     },
-    request: {
-      type: 'boolean'
+    queryCache: {
+      type: 'boolean',
+      name: 'query_cache'
     }
   },
   urls: [
@@ -3801,13 +3807,13 @@ api.indices.prototype.stats = ca({
             'completion',
             'docs',
             'fielddata',
-            'query_cache',
+            'filter_cache',
             'flush',
             'get',
             'indexing',
             'merge',
             'percolate',
-            'request_cache',
+            'query_cache',
             'refresh',
             'search',
             'segments',
@@ -3828,13 +3834,13 @@ api.indices.prototype.stats = ca({
             'completion',
             'docs',
             'fielddata',
-            'query_cache',
+            'filter_cache',
             'flush',
             'get',
             'indexing',
             'merge',
             'percolate',
-            'request_cache',
+            'query_cache',
             'refresh',
             'search',
             'segments',
@@ -4559,13 +4565,13 @@ api.nodes.prototype.stats = ca({
             'completion',
             'docs',
             'fielddata',
-            'query_cache',
+            'filter_cache',
             'flush',
             'get',
             'indexing',
             'merge',
             'percolate',
-            'request_cache',
+            'query_cache',
             'refresh',
             'search',
             'segments',
@@ -4626,13 +4632,13 @@ api.nodes.prototype.stats = ca({
             'completion',
             'docs',
             'fielddata',
-            'query_cache',
+            'filter_cache',
             'flush',
             'get',
             'indexing',
             'merge',
             'percolate',
-            'request_cache',
+            'query_cache',
             'refresh',
             'search',
             'segments',
@@ -4901,29 +4907,6 @@ api.putTemplate = ca({
   method: 'PUT'
 });
 
-/**
- * Perform a [renderSearchTemplate](http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-template.html) request
- *
- * @param {Object} params - An object with parameters used to carry out this action
- * @param {String} params.id - The id of the stored search template
- */
-api.renderSearchTemplate = ca({
-  urls: [
-    {
-      fmt: '/_render/template/<%=id%>',
-      req: {
-        id: {
-          type: 'string'
-        }
-      }
-    },
-    {
-      fmt: '/_render/template'
-    }
-  ],
-  method: 'POST'
-});
-
 /**
  * Perform a [scroll](http://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-scroll.html) request
  *
@@ -4994,7 +4977,7 @@ api.scroll = ca({
  * @param {Date, Number} params.timeout - Explicit operation timeout
  * @param {Boolean} params.trackScores - Whether to calculate and return scores even if they are not used for sorting
  * @param {Boolean} params.version - Specify whether to return document version as part of a hit
- * @param {Boolean} params.requestCache - Specify if request cache should be used for this request or not, defaults to index level setting
+ * @param {Boolean} params.queryCache - Specify if query cache should be used for this request or not, defaults to index level setting
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices
  * @param {String, String[], Boolean} params.type - A comma-separated list of document types to search; leave empty to perform the operation on all types
  */
@@ -5136,9 +5119,9 @@ api.search = ca({
     version: {
       type: 'boolean'
     },
-    requestCache: {
+    queryCache: {
       type: 'boolean',
-      name: 'request_cache'
+      name: 'query_cache'
     }
   },
   urls: [
@@ -5454,7 +5437,17 @@ api.snapshot.prototype.create = ca({
       name: 'wait_for_completion'
     }
   },
-  url: {},
+  url: {
+    fmt: '/_snapshot/<%=repository%>/<%=snapshot%>/_create',
+    req: {
+      repository: {
+        type: 'string'
+      },
+      snapshot: {
+        type: 'string'
+      }
+    }
+  },
   method: 'POST'
 });