diff --git a/site/apidocs.zip b/site/apidocs.zip
index dd2c58be..ec6f571e 100644
Binary files a/site/apidocs.zip and b/site/apidocs.zip differ
diff --git a/site/emma.zip b/site/emma.zip
index b39e9250..7cdc8a5e 100644
Binary files a/site/emma.zip and b/site/emma.zip differ
diff --git a/site/reference.zip b/site/reference.zip
index 48d4c883..10b4e19e 100644
Binary files a/site/reference.zip and b/site/reference.zip differ
diff --git a/site/reference/html/index.html b/site/reference/html/index.html
index 8fafe6c6..e05e546d 100644
--- a/site/reference/html/index.html
+++ b/site/reference/html/index.html
@@ -707,7 +707,7 @@ http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.
 @Produces
 @ApplicationScoped
 <span class="hl-keyword">public</span> ElasticsearchOperations createElasticsearchTemplate() {
-    <span class="hl-keyword">return</span> <span class="hl-keyword">new</span> ElasticsearchTemplate(<span class="hl-keyword">new</span> EmbeddedElasticsearchServerFactory(<span class="hl-string">"classpath:com/acme/Elasticsearch"</span>));
+    <span class="hl-keyword">return</span> <span class="hl-keyword">new</span> ElasticsearchTemplate(nodeBuilder().local(true).node().client());
   }
 }
 
@@ -838,13 +838,13 @@ http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.
 								</td><td>
 									<code class="code">findByNameIn(Collection&lt;String&gt;names)</code>
 								</td><td>
-									<code class="code">Not Supported Yet !</code>
+									<code class="code">{"bool" : {"must" : {"bool" : {"should" : [ {"field" : {"name" : "?"}}, {"field" : {"name" : "?"}} ]}}}}</code>
 								</td></tr><tr><td>
 									<code class="code">NotIn</code>
 								</td><td>
 									<code class="code">findByNameNotIn(Collection&lt;String&gt;names)</code>
 								</td><td>
-									<code class="code">Not Supported Yet !</code>
+									<code class="code">{"bool" : {"must_not" : {"bool" : {"should" : {"field" : {"name" : "?"}}}}}}</code>
 								</td></tr><tr><td>
 									<code class="code">Near</code>
 								</td><td>
@@ -856,19 +856,19 @@ http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.
 								</td><td>
 									<code class="code">findByAvailableTrue</code>
 								</td><td>
-									<code class="code">Not Supported Yet !</code>
+									<code class="code">{"bool" : {"must" : {"field" : {"available" : true}}}}</code>
 								</td></tr><tr><td>
 									<code class="code">False</code>
 								</td><td>
 									<code class="code">findByAvailableFalse</code>
 								</td><td>
-									<code class="code">Not Supported Yet !</code>
+									<code class="code">{"bool" : {"must" : {"field" : {"available" : false}}}}</code>
 								</td></tr><tr><td>
 									<code class="code">OrderBy</code>
 								</td><td>
 									<code class="code">findByAvailableTrueOrderByNameDesc</code>
 								</td><td>
-									<code class="code">Not Supported Yet !</code>
+									<code class="code">{"sort" : [{ "name" : {"order" : "desc"} }],"bool" : {"must" : {"field" : {"available" : true}}}}</code>
 								</td></tr></tbody></table></div></div><p><br class="table-break">
 			</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="elasticsearch.query-methods.at-query"></a>2.2.3.&nbsp;Using @Query Annotation</h3></div></div></div><div class="example"><a name="d0e1289"></a><p class="title"><b>Example&nbsp;2.7.&nbsp;
 					Declare query at the method using the
diff --git a/site/reference/pdf/spring-data-elasticsearch-reference.pdf b/site/reference/pdf/spring-data-elasticsearch-reference.pdf
index 183a992f..55ed7520 100644
Binary files a/site/reference/pdf/spring-data-elasticsearch-reference.pdf and b/site/reference/pdf/spring-data-elasticsearch-reference.pdf differ
diff --git a/src/docbkx/reference/data-elasticsearch.xml b/src/docbkx/reference/data-elasticsearch.xml
index 1c327e8f..dfc84eb9 100644
--- a/src/docbkx/reference/data-elasticsearch.xml
+++ b/src/docbkx/reference/data-elasticsearch.xml
@@ -370,7 +370,7 @@ public void setRepository(ProductRepository repository) {
 									<code>findByNameIn(Collection&lt;String&gt;names)</code>
 								</entry>
 								<entry>
-									<code>Not Supported Yet !</code>
+									<code>{"bool" : {"must" : {"bool" : {"should" : [ {"field" : {"name" : "?"}}, {"field" : {"name" : "?"}} ]}}}}</code>
 								</entry>
 							</row>
 							<row>
@@ -381,7 +381,7 @@ public void setRepository(ProductRepository repository) {
 									<code>findByNameNotIn(Collection&lt;String&gt;names)</code>
 								</entry>
 								<entry>
-									<code>Not Supported Yet !</code>
+									<code>{"bool" : {"must_not" : {"bool" : {"should" : {"field" : {"name" : "?"}}}}}}</code>
 								</entry>
 							</row>
 							<row>
@@ -403,7 +403,7 @@ public void setRepository(ProductRepository repository) {
 									<code>findByAvailableTrue</code>
 								</entry>
 								<entry>
-									<code>Not Supported Yet !</code>
+									<code>{"bool" : {"must" : {"field" : {"available" : true}}}}</code>
 								</entry>
 							</row>
 							<row>
@@ -414,7 +414,7 @@ public void setRepository(ProductRepository repository) {
 									<code>findByAvailableFalse</code>
 								</entry>
 								<entry>
-									<code>Not Supported Yet !</code>
+									<code>{"bool" : {"must" : {"field" : {"available" : false}}}}</code>
 								</entry>
 							</row>
 							<row>
@@ -425,7 +425,7 @@ public void setRepository(ProductRepository repository) {
 									<code>findByAvailableTrueOrderByNameDesc</code>
 								</entry>
 								<entry>
-									<code>Not Supported Yet !</code>
+									<code>{"sort" : [{ "name" : {"order" : "desc"} }],"bool" : {"must" : {"field" : {"available" : true}}}}</code>
 								</entry>
 							</row>
 						</tbody>
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java
index 950c0165..8cc73340 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java
@@ -340,19 +340,29 @@ public class CustomMethodRepositoryTest {
         String documentId = randomNumeric(5);
         SampleEntity sampleEntity = new SampleEntity();
         sampleEntity.setId(documentId);
-        sampleEntity.setType("test");
-        sampleEntity.setMessage("foo");
+        sampleEntity.setType("abc");
+        sampleEntity.setMessage("test");
         sampleEntity.setAvailable(true);
         repository.save(sampleEntity);
 
-        //given
+        //document 2
         String documentId2 = randomNumeric(5);
         SampleEntity sampleEntity2 = new SampleEntity();
         sampleEntity2.setId(documentId2);
-        sampleEntity2.setType("test");
+        sampleEntity2.setType("xyz");
         sampleEntity2.setMessage("bar");
         sampleEntity2.setAvailable(false);
         repository.save(sampleEntity2);
+
+        //document 3
+        String documentId3 = randomNumeric(5);
+        SampleEntity sampleEntity3 = new SampleEntity();
+        sampleEntity3.setId(documentId3);
+        sampleEntity3.setType("def");
+        sampleEntity3.setMessage("foo");
+        sampleEntity3.setAvailable(false);
+        repository.save(sampleEntity3);
+
         //when
         Page<SampleEntity> page = repository.findByMessageOrderByTypeAsc("foo",new PageRequest(1, 10));
         //then