diff --git a/Classes/Connection/Elasticsearch.php b/Classes/Connection/Elasticsearch.php
index 560ca07..7f963ea 100644
--- a/Classes/Connection/Elasticsearch.php
+++ b/Classes/Connection/Elasticsearch.php
@@ -146,12 +146,35 @@ class Elasticsearch implements Singleton, ConnectionInterface
     {
         $this->logger->debug('Search for', [$searchRequest->getSearchTerm()]);
 
+        $query = [
+            'bool' => [
+                'must' => [
+                    [
+                        'match' => [
+                            '_all' => $searchRequest->getSearchTerm()
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        if ($searchRequest->hasFilter()) {
+            $queryFilter = [];
+            foreach ($searchRequest->getFilter() as $field => $value) {
+                $queryFilter[$field] = $value;
+            }
+
+            $query['bool']['filter'] = [
+                'term' => $queryFilter,
+            ];
+        }
+
         $search = new \Elastica\Search($this->connection->getClient());
         $search->addIndex('typo3content');
-
+        $search->setQuery(new \Elastica\Query(['query' => $query]));
         // TODO: Return wrapped result to implement our interface.
         // Also update php doc to reflect the change.
-        return $search->search('"' . $searchRequest->getSearchTerm() . '"');
+        return $search->search();
     }
 
     /**
diff --git a/Classes/Domain/Model/SearchRequest.php b/Classes/Domain/Model/SearchRequest.php
index 1de2f71..105cc45 100644
--- a/Classes/Domain/Model/SearchRequest.php
+++ b/Classes/Domain/Model/SearchRequest.php
@@ -32,7 +32,12 @@ class SearchRequest implements SearchRequestInterface
      *
      * @var string
      */
-    protected $query;
+    protected $query = '';
+
+    /**
+     * @var array
+     */
+    protected $filter = [];
 
     /**
      * @param string $query
@@ -57,4 +62,28 @@ class SearchRequest implements SearchRequestInterface
     {
         return $this->query;
     }
+
+    /**
+     * @param array $filter
+     */
+    public function setFilter(array $filter)
+    {
+        $this->filter = $filter;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasFilter()
+    {
+        return count($this->filter);
+    }
+
+    /**
+     * @return array
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
 }