diff --git a/src/docbkx/reference/data-elasticsearch.xml b/src/docbkx/reference/data-elasticsearch.xml
index dfc84eb91..88b48dbc1 100644
--- a/src/docbkx/reference/data-elasticsearch.xml
+++ b/src/docbkx/reference/data-elasticsearch.xml
@@ -448,24 +448,8 @@ public void setRepository(ProductRepository repository) {
 }</programlisting>
 			</example>
 		</section>
-		<!--<section id="elasticsearch.query-methods.named-queries">-->
-			<!--<title>Using NamedQueries</title>-->
-			<!--<para>-->
-				<!--Named queries can be kept in a properties file and wired to the-->
-				<!--accroding method. Please mind the naming convention described in-->
-				<!--<xref linkend="repositories.query-methods.query-lookup-strategies" />-->
-				<!--or use-->
-				<!--<interfacename>@Query</interfacename>-->
-				<!--.-->
-			<!--</para>-->
-			<!--<example>-->
-				<!--<title>-->
-					<!--Declare named query in properites file-->
-				<!--</title>-->
-				<!--<programlisting></programlisting>-->
-				<!--<programlisting language="java">-->
-<!--}</programlisting>-->
-			<!--</example>-->
-		<!--</section>-->
+
 	</section>
+
+
 </chapter>
\ No newline at end of file
diff --git a/src/docbkx/reference/elasticsearch-misc.xml b/src/docbkx/reference/elasticsearch-misc.xml
index a152b78d6..44c6257c7 100644
--- a/src/docbkx/reference/elasticsearch-misc.xml
+++ b/src/docbkx/reference/elasticsearch-misc.xml
@@ -30,4 +30,53 @@ Page&lt;SampleEntity&gt; sampleEntities = elasticsearchTemplate.queryForPage(sea
 </programlisting>
 		</example>
 	</section>
+    <section id="elasticsearch.scan.and.scroll">
+        <title>Using Scan And Scroll For Big Result Set</title>
+        <para>
+            Elasticsearch has scan and scroll feature for getting big result set in chunks.
+            <interfacename>ElasticsearchTemplate</interfacename>
+            has scan and scroll methods that can be used as below.
+        </para>
+        <example>
+            <title>
+                Using Scan and Scroll
+            </title>
+            <programlisting language="java">
+                SearchQuery searchQuery = new SearchQuery();
+                searchQuery.addIndices("test-index");
+                searchQuery.addTypes("test-type");
+                searchQuery.setElasticsearchQuery(matchAllQuery());
+                searchQuery.setPageable(new PageRequest(0,1));
+                String scrollId = elasticsearchTemplate.scan(searchQuery,1000,false);
+                List&lt;SampleEntity&gt; sampleEntities = new ArrayList&lt;SampleEntity&gt;();
+                boolean hasRecords = true;
+                while (hasRecords){
+                Page&lt;SampleEntity&gt; page = elasticsearchTemplate.scroll(scrollId, 5000L , new ResultsMapper&lt;SampleEntity&gt;() {
+                @Override
+                public Page&lt;SampleEntity&gt; mapResults(SearchResponse response) {
+                List&lt;SampleEntity&gt; chunk = new ArrayList&lt;SampleEntity&gt;();
+                for(SearchHit searchHit : response.getHits()){
+                if(response.getHits().getHits().length &lt;= 0) {
+                return null;
+                }
+                SampleEntity user = new SampleEntity();
+                user.setId(searchHit.getId());
+                user.setMessage((String)searchHit.getSource().get("message"));
+                chunk.add(user);
+                }
+                return new PageImpl&lt;SampleEntity&gt;(chunk);
+                }
+
+                });
+                if(page != null) {
+                sampleEntities.addAll(page.getContent());
+                hasRecords = page.hasNextPage();
+                }
+                else{
+                hasRecords = false;
+                }
+                }
+                }</programlisting>
+        </example>
+    </section>
 </chapter>
\ No newline at end of file