diff --git a/Finder/FinderInterface.php b/Finder/FinderInterface.php
index 731062b..8366cc3 100644
--- a/Finder/FinderInterface.php
+++ b/Finder/FinderInterface.php
@@ -7,10 +7,9 @@ interface FinderInterface
     /**
      * Searches for query results within a given limit
      *
-     * @param mixed $query Can be a string, an array or an Elastica_Query object
-     * @param int   $limit How many results to get
-     *
+     * @param mixed $query  Can be a string, an array or an Elastica_Query object
+     * @param int $limit How many results to get
      * @return array results
      */
-    function find($query, $limit);
+    function find($query, $limit = null);
 }
diff --git a/Logger/ElasticaLogger.php b/Logger/ElasticaLogger.php
index 6e39602..415e53b 100644
--- a/Logger/ElasticaLogger.php
+++ b/Logger/ElasticaLogger.php
@@ -16,16 +16,18 @@ class ElasticaLogger
 {
     protected $logger;
     protected $queries;
+    protected $debug;
 
     /**
      * Constructor.
      *
      * @param LoggerInterface $logger The Symfony logger
      */
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(LoggerInterface $logger = null, $debug = false)
     {
         $this->logger = $logger;
         $this->queries = array();
+        $this->debug = $debug;
     }
 
     /**
@@ -38,12 +40,14 @@ class ElasticaLogger
      */
     public function logQuery($path, $method, $data, $time)
     {
-        $this->queries[] = array(
-            'path' => $path,
-            'method' => $method,
-            'data' => $data,
-            'executionMS' => $time
-        );
+        if ($this->debug) {
+            $this->queries[] = array(
+                'path' => $path,
+                'method' => $method,
+                'data' => $data,
+                'executionMS' => $time
+            );
+        }
 
         if (null !== $this->logger) {
             $message = sprintf("%s (%s) %0.2f ms", $path, $method, $time * 1000);
diff --git a/Repository.php b/Repository.php
index 58404b3..503973e 100644
--- a/Repository.php
+++ b/Repository.php
@@ -19,22 +19,21 @@ class Repository
         $this->finder = $finder;
     }
 
-
     public function find($query, $limit=null)
     {
         return $this->finder->find($query, $limit);
     }
 
+    public function findHybrid($query, $limit=null)
+    {
+        return $this->finder->findHybrid($query, $limit);
+    }
+
     public function findPaginated($query)
     {
         return $this->finder->findPaginated($query);
     }
 
-    public function findHybrid($query)
-    {
-        return $this->finder->findHybrid($query);
-    }
-
     public function createPaginatorAdapter($query)
     {
         return $this->finder->createPaginatorAdapter($query);
diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index 95e2bb8..95c5406 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -19,6 +19,7 @@
 
         <service id="foq_elastica.logger" class="%foq_elastica.logger.class%">
             <argument type="service" id="logger" on-invalid="null" />
+            <argument>%kernel.debug%</argument>
             <tag name="monolog.logger" channel="elastica" />
         </service>
         <service id="foq_elastica.data_collector" class="%foq_elastica.data_collector.class%" public="true">
diff --git a/Tests/Logger/ElasticaLoggerTest.php b/Tests/Logger/ElasticaLoggerTest.php
index 858975b..566757c 100644
--- a/Tests/Logger/ElasticaLoggerTest.php
+++ b/Tests/Logger/ElasticaLoggerTest.php
@@ -18,7 +18,7 @@ class ElasticaLoggerTest extends \PHPUnit_Framework_TestCase
 
     public function testCorrectAmountIfRandomNumberOfQueriesAdded()
     {
-        $elasticaLogger = new ElasticaLogger;
+        $elasticaLogger = new ElasticaLogger(null, true);
 
         $total = rand(1, 15);
         for ($i = 0; $i < $total; $i++) {
@@ -30,7 +30,7 @@ class ElasticaLoggerTest extends \PHPUnit_Framework_TestCase
 
     public function testCorrectlyFormattedQueryReturned()
     {
-        $elasticaLogger = new ElasticaLogger;
+        $elasticaLogger = new ElasticaLogger(null, true);
 
         $path   = 'testPath';
         $method = 'testMethod';
@@ -49,6 +49,18 @@ class ElasticaLoggerTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $returnedQueries[0]);
     }
 
+    public function testNoQueriesStoredIfDebugFalseAdded()
+    {
+        $elasticaLogger = new ElasticaLogger(null, false);
+
+        $total = rand(1, 15);
+        for ($i = 0; $i < $total; $i++) {
+            $elasticaLogger->logQuery('testPath', 'testMethod', array('data'), 12);
+        }
+
+        $this->assertEquals(0, $elasticaLogger->getNbQueries());
+    }
+
     public function testQueryIsLogged()
     {
         $loggerMock = $this->getMockBuilder('Symfony\Component\HttpKernel\Log\LoggerInterface')
diff --git a/Tests/RepositoryTest.php b/Tests/RepositoryTest.php
index 1b44543..6d51f29 100644
--- a/Tests/RepositoryTest.php
+++ b/Tests/RepositoryTest.php
@@ -25,6 +25,22 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $repository->find($testQuery);
     }
 
+    public function testThatFindCallsFindOnFinderWithLimit()
+    {
+        $testQuery = 'Test Query';
+        $testLimit = 20;
+
+        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $finderMock->expects($this->once())
+            ->method('find')
+            ->with($this->equalTo($testQuery), $this->equalTo($testLimit));
+
+        $repository = new Repository($finderMock);
+        $repository->find($testQuery, $testLimit);
+    }
+
     public function testThatFindPaginatedCallsFindPaginatedOnFinder()
     {
         $testQuery = 'Test Query';
@@ -40,4 +56,20 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $repository->findPaginated($testQuery);
     }
 
+    public function testThatFindHybridCallsFindHybridOnFinder()
+    {
+        $testQuery = 'Test Query';
+        $testLimit = 20;
+
+        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $finderMock->expects($this->once())
+            ->method('findHybrid')
+            ->with($this->equalTo($testQuery), $this->equalTo($testLimit));
+
+        $repository = new Repository($finderMock);
+        $repository->findHybrid($testQuery, $testLimit);
+    }
+
 }