diff --git a/core/components/simplesearch/docs/changelog.txt b/core/components/simplesearch/docs/changelog.txt
index 1553e32..ccd5f71 100755
--- a/core/components/simplesearch/docs/changelog.txt
+++ b/core/components/simplesearch/docs/changelog.txt
@@ -1,5 +1,10 @@
 Changelog for SimpleSearch.
 
+- Added a new snippet property onlyFacet [#28]
+- Add basic debug option [#27]
+- Update Elastica [#33]
+- Update exclude parameter to always be active and to use idType [#33]
+
 SimpleSearch 1.9.2
 ========================================================================
 - Generate extract for whole search string, not just for last part
diff --git a/core/components/simplesearch/elements/snippets/simplesearch.snippet.php b/core/components/simplesearch/elements/snippets/simplesearch.snippet.php
index 37be7b7..484f0c8 100755
--- a/core/components/simplesearch/elements/snippets/simplesearch.snippet.php
+++ b/core/components/simplesearch/elements/snippets/simplesearch.snippet.php
@@ -38,20 +38,30 @@
 $searchIndex = $modx->getOption('searchIndex',$scriptProperties,'search');
 $toPlaceholder = $modx->getOption('toPlaceholder',$scriptProperties,false);
 $noResultsTpl = $modx->getOption('noResultsTpl',$scriptProperties,'SearchNoResults');
+$debug = (bool)$modx->getOption('debug', $scriptProperties, false);
 
+$debug_output = '';
 /* get search string */
 if (empty($_REQUEST[$searchIndex])) {
     $output = $search->getChunk($noResultsTpl,array(
         'query' => '',
     ));
-    return $search->output($output,$toPlaceholder);
+
+    if ( $debug ) {
+        $debug_output .= '<br>No search in the URL request for searchIndex: '.$searchIndex;
+    }
+    return $debug_output.$search->output($output,$toPlaceholder);
 }
 $searchString = $search->parseSearchString($_REQUEST[$searchIndex]);
 if (!$searchString) {
     $output = $search->getChunk($noResultsTpl,array(
         'query' => $searchString,
     ));
-    return $search->output($output,$toPlaceholder);
+
+    if ( $debug ) {
+        $debug_output .= '<br>Search string was empty after parsing &amp; sanitizing for searchIndex: '.$searchIndex;
+    }
+    return $debug_output.$search->output($output,$toPlaceholder);
 }
 
 /* setup default properties */
@@ -75,48 +85,66 @@
 $postHooks = $modx->getOption('postHooks',$scriptProperties,'');
 $activeFacet = $modx->getOption('facet',$_REQUEST,$modx->getOption('activeFacet',$scriptProperties,'default'));
 $activeFacet = $modx->sanitizeString($activeFacet);
+$onlyFacet = $modx->getOption('onlyFacet', $scriptProperties, null);
 $facetLimit = $modx->getOption('facetLimit',$scriptProperties,5);
 $outputSeparator = $modx->getOption('outputSeparator',$scriptProperties,"\n");
 $addSearchToLink = intval($modx->getOption('addSearchToLink',$scriptProperties,"0"));
 $searchInLinkName = $modx->getOption('searchInLinkName',$scriptProperties,"search");
 
 /* get results */
-$response = $search->getSearchResults($searchString,$scriptProperties);
-$placeholders = array('query' => $searchString);
-$resultsTpl = array('default' => array('results' => array(),'total' => $response['total']));
-if (!empty($response['results'])) {
-    /* iterate through search results */
-    foreach ($response['results'] as $resourceArray) {
-        $resourceArray['idx'] = $idx;
-        if (empty($resourceArray['link'])) {
-            $ctx = !empty($resourceArray['context_key']) ? $resourceArray['context_key'] : $modx->context->get('key');
-            $args = '';
-            if ($addSearchToLink) {
-                $args = array($searchInLinkName => $searchString);
-            }
-            $resourceArray['link'] = $modx->makeUrl($resourceArray['id'],$ctx,$args);
+if ( !is_null($onlyFacet) && $onlyFacet != 'default' ) {
+    $activeFacet = $onlyFacet;
+} else {
+    $response = $search->getSearchResults($searchString, $scriptProperties);
+    $placeholders = array('query' => $searchString);
+    $resultsTpl = array('default' => array('results' => array(), 'total' => $response['total']));
+    if (!empty($response['results'])) {
+        if ($debug) {
+            $debug_output .= '<br>Begin iterate through search results';
         }
-        if ($showExtract) {
-            $extract = $searchString;
-            if (array_key_exists($extractSource, $resourceArray)) {
-                $text = $resourceArray[$extractSource];
-            } else {
-                $text = $modx->runSnippet($extractSource, $resourceArray);
+        /* iterate through search results */
+        foreach ($response['results'] as $resourceArray) {
+            $resourceArray['idx'] = $idx;
+            if ($debug) {
+                $debug_output .= '<br>Search found resource ID: ' . $resourceArray['id'];
             }
-            $extract = $search->createExtract($text,$extractLength,$extract,$extractEllipsis);
-            /* cleanup extract */
-            $extract = strip_tags(preg_replace("#\<!--(.*?)--\>#si",'',$extract));
-            $extract = preg_replace("#\[\[(.*?)\]\]#si",'',$extract);
-            $extract = str_replace(array('[[',']]'),'',$extract);
-            $resourceArray['extract'] = !empty($highlightResults) ? $search->addHighlighting($extract,$highlightClass,$highlightTag) : $extract;
+            if (empty($resourceArray['link'])) {
+                $ctx = !empty($resourceArray['context_key']) ? $resourceArray['context_key'] : $modx->context->get('key');
+                $args = '';
+                if ($addSearchToLink) {
+                    $args = array($searchInLinkName => $searchString);
+                }
+                $resourceArray['link'] = $modx->makeUrl($resourceArray['id'], $ctx, $args);
+            }
+            if ($showExtract) {
+                $extract = $searchString;
+                if (array_key_exists($extractSource, $resourceArray)) {
+                    $text = $resourceArray[$extractSource];
+                } else {
+                    $text = $modx->runSnippet($extractSource, $resourceArray);
+                }
+                $extract = $search->createExtract($text, $extractLength, $extract, $extractEllipsis);
+                /* cleanup extract */
+                $extract = strip_tags(preg_replace("#\<!--(.*?)--\>#si", '', $extract));
+                $extract = preg_replace("#\[\[(.*?)\]\]#si", '', $extract);
+                $extract = str_replace(array('[[', ']]'), '', $extract);
+                $resourceArray['extract'] = !empty($highlightResults) ? $search->addHighlighting($extract, $highlightClass, $highlightTag) : $extract;
+            }
+            $resultsTpl['default']['results'][] = $search->getChunk($tpl, $resourceArray);
+            $idx++;
+        }
+    } else {
+        if ($debug) {
+            $debug_output .= '<br>No search results for search term';
         }
-        $resultsTpl['default']['results'][] = $search->getChunk($tpl,$resourceArray);
-        $idx++;
     }
 }
-
 /* load postHooks to get faceted results */
+$isFacetResults = false;
 if (!empty($postHooks)) {
+    if ($debug) {
+        $debug_output .= '<br>Post hooks found';
+    }
     $limit = !empty($facetLimit) ? $facetLimit : $perPage;
     $search->loadHooks('post');
     $search->postHooks->loadMultiple($postHooks,$response['results'],array(
@@ -128,16 +156,29 @@
     ));
     if (!empty($search->postHooks->facets)) {
         foreach ($search->postHooks->facets as $facetKey => $facetResults) {
+
+            if ($debug) {
+                $debug_output .= '<br>Facet key: '.$facetKey;
+            }
             if (empty($resultsTpl[$facetKey])) {
                 $resultsTpl[$facetKey] = array();
                 $resultsTpl[$facetKey]['total'] = $facetResults['total'];
                 $resultsTpl[$facetKey]['results'] = array();
+                if ($debug) {
+                    $debug_output .= ' - results have not yet been added';
+                }
             } else {
-                $resultsTpl[$facetKey]['total'] = $resultsTpl[$facetKey]['total'] = $facetResults['total'];
+                $resultsTpl[$facetKey]['total'] = $facetResults['total'];
+                if ($debug) {
+                    $debug_output .= ' - results have already been added: '.$resultsTpl[$facetKey]['total'];
+                }
             }
 
             $idx = !empty($resultsTpl[$facetKey]) ? count($resultsTpl[$facetKey]['results'])+1 : 1;
             foreach ($facetResults['results'] as $r) {
+                if ($debug) {
+                    $debug_output .= '<br>'.$facetKey.' results # '.$idx;
+                }
                 $r['idx'] = $idx;
                 $fTpl = !empty($scriptProperties['tpl'.$facetKey]) ? $scriptProperties['tpl'.$facetKey] : $tpl;
                 $resultsTpl[$facetKey]['results'][] = $search->getChunk($fTpl,$r);
@@ -145,6 +186,10 @@
             }
         }
     }
+} else {
+    if ($debug) {
+        $debug_output .= '<br>No post hooks found';
+    }
 }
 
 /* set faceted results to placeholders for easy result positioning */
@@ -154,13 +199,25 @@
     $placeholders[$facetKey.'.results'] = $resultSet;
     $placeholders[$facetKey.'.total'] = !empty($facetResults['total']) ? $facetResults['total'] : 0;
     $placeholders[$facetKey.'.key'] = $facetKey;
+    if ( $placeholders[$facetKey.'.total'] > 0 ) {
+        $isFacetResults = true;
+    }
+}
+if ($debug) {
+    $debug_output .= '<br>Active facet: '.$activeFacet;
 }
 $placeholders['results'] = $placeholders[$activeFacet.'.results']; /* set active facet results */
 $placeholders['total'] = !empty($resultsTpl[$activeFacet]['total']) ? $resultsTpl[$activeFacet]['total'] : 0;
 $placeholders['page'] = isset($_REQUEST[$offsetIndex]) ? ceil(intval($_REQUEST[$offsetIndex]) / $perPage) + 1 : 1;
 $placeholders['pageCount'] = !empty($resultsTpl[$activeFacet]['total']) ? ceil($resultsTpl[$activeFacet]['total'] / $perPage) : 1;
+if ($debug) {
+    $debug_output .= '<br>Active facet total: '.$placeholders['total'].' Page: '.$placeholders['page'].' Page count: '.$placeholders['page'];
+}
 
-if (!empty($response['results'])) {
+if (!empty($response['results']) || $isFacetResults ) {
+    if ($debug) {
+        $debug_output .= '<br>Results found for simple search, add highlighting and pagination';
+    }
     /* add results found message */
     $placeholders['resultInfo'] = $modx->lexicon('sisea.results_found',array(
         'count' => $placeholders['total'],
@@ -170,6 +227,10 @@
     if ($perPage > 0) {
         $placeholders['paging'] = $search->getPagination($searchString,$perPage,$pagingSeparator,$placeholders['total']);
     }
+} else {
+    if ($debug) {
+        $debug_output .= '<br> No Results found for simple search';
+    }
 }
 $placeholders['query'] = $searchString;
 $placeholders['facet'] = $activeFacet;
@@ -178,11 +239,18 @@
 $modx->setPlaceholder($placeholderPrefix.'query',$searchString);
 $modx->setPlaceholder($placeholderPrefix.'count',$response['total']);
 $modx->setPlaceholders($placeholders,$placeholderPrefix);
-if (empty($response['results'])) {
+
+if (empty($response['results']) && !$isFacetResults ) {
     $output = $search->getChunk($noResultsTpl,array(
         'query' => $searchString,
     ));
+    if ($debug) {
+        $debug_output .= '<br>No results send to: '.$noResultsTpl.' Chunk';
+    }
 } else {
+    if ($debug) {
+        $debug_output .= '<br>Results found send to: '.$containerTpl.' Chunk';
+    }
     $output = $search->getChunk($containerTpl,$placeholders);
 }
-return $search->output($output,$toPlaceholder);
\ No newline at end of file
+return $debug_output.$search->output($output,$toPlaceholder);
\ No newline at end of file
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/AbstractScript.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/AbstractScript.php
new file mode 100755
index 0000000..81c1633
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/AbstractScript.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Elastica;
+
+use Elastica\Script\AbstractScript as BaseAbstractScript;
+
+/**
+ * Kept for BC reasons.
+ *
+ * @deprecated Use \Elastica\Script\AbstractScript instead.
+ */
+abstract class AbstractScript extends BaseAbstractScript
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/AbstractUpdateAction.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/AbstractUpdateAction.php
new file mode 100755
index 0000000..9607579
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/AbstractUpdateAction.php
@@ -0,0 +1,577 @@
+<?php
+
+namespace Elastica;
+
+use Elastica\Exception\DeprecatedException;
+
+/**
+ * Base class for things that can be sent to the update api (Document and
+ * Script).
+ *
+ * @author   Nik Everett <nik9000@gmail.com>
+ */
+class AbstractUpdateAction extends Param
+{
+    /**
+     * @var \Elastica\Document
+     */
+    protected $_upsert;
+
+    /**
+     * Sets the id of the document.
+     *
+     * @param string $id
+     *
+     * @return $this
+     */
+    public function setId($id)
+    {
+        return $this->setParam('_id', $id);
+    }
+
+    /**
+     * Returns document id.
+     *
+     * @return string|int Document id
+     */
+    public function getId()
+    {
+        return ($this->hasParam('_id')) ? $this->getParam('_id') : null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasId()
+    {
+        return '' !== (string) $this->getId();
+    }
+
+    /**
+     * Sets lifetime of document.
+     *
+     * @param string $ttl
+     *
+     * @return $this
+     */
+    public function setTtl($ttl)
+    {
+        return $this->setParam('_ttl', $ttl);
+    }
+
+    /**
+     * @return string
+     */
+    public function getTtl()
+    {
+        return $this->getParam('_ttl');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasTtl()
+    {
+        return $this->hasParam('_ttl');
+    }
+
+    /**
+     * Sets the document type name.
+     *
+     * @param string $type Type name
+     *
+     * @return $this
+     */
+    public function setType($type)
+    {
+        if ($type instanceof Type) {
+            $this->setIndex($type->getIndex());
+            $type = $type->getName();
+        }
+
+        return $this->setParam('_type', $type);
+    }
+
+    /**
+     * Return document type name.
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return string Document type name
+     */
+    public function getType()
+    {
+        return $this->getParam('_type');
+    }
+
+    /**
+     * Sets the document index name.
+     *
+     * @param string $index Index name
+     *
+     * @return $this
+     */
+    public function setIndex($index)
+    {
+        if ($index instanceof Index) {
+            $index = $index->getName();
+        }
+
+        return $this->setParam('_index', $index);
+    }
+
+    /**
+     * Get the document index name.
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return string Index name
+     */
+    public function getIndex()
+    {
+        return $this->getParam('_index');
+    }
+
+    /**
+     * Sets the version of a document for use with optimistic concurrency control.
+     *
+     * @param int $version Document version
+     *
+     * @return $this
+     *
+     * @link https://www.elastic.co/blog/versioning
+     */
+    public function setVersion($version)
+    {
+        return $this->setParam('_version', (int) $version);
+    }
+
+    /**
+     * Returns document version.
+     *
+     * @return string|int Document version
+     */
+    public function getVersion()
+    {
+        return $this->getParam('_version');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasVersion()
+    {
+        return $this->hasParam('_version');
+    }
+
+    /**
+     * Sets the version_type of a document
+     * Default in ES is internal, but you can set to external to use custom versioning.
+     *
+     * @param int $versionType Document version type
+     *
+     * @return $this
+     */
+    public function setVersionType($versionType)
+    {
+        return $this->setParam('_version_type', $versionType);
+    }
+
+    /**
+     * Returns document version type.
+     *
+     * @return string|int Document version type
+     */
+    public function getVersionType()
+    {
+        return $this->getParam('_version_type');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasVersionType()
+    {
+        return $this->hasParam('_version_type');
+    }
+
+    /**
+     * Sets parent document id.
+     *
+     * @param string|int $parent Parent document id
+     *
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-parent-field.html
+     */
+    public function setParent($parent)
+    {
+        return $this->setParam('_parent', $parent);
+    }
+
+    /**
+     * Returns the parent document id.
+     *
+     * @return string|int Parent document id
+     */
+    public function getParent()
+    {
+        return $this->getParam('_parent');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasParent()
+    {
+        return $this->hasParam('_parent');
+    }
+
+    /**
+     * Set operation type.
+     *
+     * @param string $opType Only accept create
+     *
+     * @return $this
+     */
+    public function setOpType($opType)
+    {
+        return $this->setParam('_op_type', $opType);
+    }
+
+    /**
+     * Get operation type.
+     *
+     * @return string
+     */
+    public function getOpType()
+    {
+        return $this->getParam('_op_type');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasOpType()
+    {
+        return $this->hasParam('_op_type');
+    }
+
+    /**
+     * Set percolate query param.
+     *
+     * @param string $value percolator filter
+     *
+     * @deprecated Option "percolate" deprecated as of ES 1.3 and will be removed in further Elastica releases. Use Percolator instead.
+     *
+     * @return $this
+     */
+    public function setPercolate($value = '*')
+    {
+        throw new DeprecatedException('Option "percolate" deprecated as of ES 1.3 and will be removed in further Elastica releases. Use Percolator instead.');
+    }
+
+    /**
+     * Get percolate parameter.
+     *
+     * @deprecated Option "percolate" deprecated as of ES 1.3 and will be removed in further Elastica releases. Use Percolator instead.
+     *
+     * @return string
+     */
+    public function getPercolate()
+    {
+        throw new DeprecatedException('Option "percolate" deprecated as of ES 1.3 and will be removed in further Elastica releases. Use Percolator instead.');
+    }
+
+    /**
+     * @deprecated Option "percolate" deprecated as of ES 1.3 and will be removed in further Elastica releases. Use Percolator instead.
+     *
+     * @return bool
+     */
+    public function hasPercolate()
+    {
+        throw new DeprecatedException('Option "percolate" deprecated as of ES 1.3 and will be removed in further Elastica releases. Use Percolator instead.');
+    }
+
+    /**
+     * Set routing query param.
+     *
+     * @param string $value routing
+     *
+     * @return $this
+     */
+    public function setRouting($value)
+    {
+        return $this->setParam('_routing', $value);
+    }
+
+    /**
+     * Get routing parameter.
+     *
+     * @return string
+     */
+    public function getRouting()
+    {
+        return $this->getParam('_routing');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasRouting()
+    {
+        return $this->hasParam('_routing');
+    }
+
+    /**
+     * @param array|string $fields
+     *
+     * @return $this
+     */
+    public function setFields($fields)
+    {
+        if (is_array($fields)) {
+            $fields = implode(',', $fields);
+        }
+
+        return $this->setParam('_fields', (string) $fields);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setFieldsSource()
+    {
+        return $this->setFields('_source');
+    }
+
+    /**
+     * @return string
+     */
+    public function getFields()
+    {
+        return $this->getParam('_fields');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasFields()
+    {
+        return $this->hasParam('_fields');
+    }
+
+    /**
+     * @param int $num
+     *
+     * @return $this
+     */
+    public function setRetryOnConflict($num)
+    {
+        return $this->setParam('_retry_on_conflict', (int) $num);
+    }
+
+    /**
+     * @return int
+     */
+    public function getRetryOnConflict()
+    {
+        return $this->getParam('_retry_on_conflict');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasRetryOnConflict()
+    {
+        return $this->hasParam('_retry_on_conflict');
+    }
+
+    /**
+     * @param string $timestamp
+     *
+     * @return $this
+     */
+    public function setTimestamp($timestamp)
+    {
+        return $this->setParam('_timestamp', $timestamp);
+    }
+
+    /**
+     * @return int
+     */
+    public function getTimestamp()
+    {
+        return $this->getParam('_timestamp');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasTimestamp()
+    {
+        return $this->hasParam('_timestamp');
+    }
+
+    /**
+     * @param bool $refresh
+     *
+     * @return $this
+     */
+    public function setRefresh($refresh = true)
+    {
+        return $this->setParam('_refresh', (bool) $refresh);
+    }
+
+    /**
+     * @return bool
+     */
+    public function getRefresh()
+    {
+        return $this->getParam('_refresh');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasRefresh()
+    {
+        return $this->hasParam('_refresh');
+    }
+
+    /**
+     * @param string $timeout
+     *
+     * @return $this
+     */
+    public function setTimeout($timeout)
+    {
+        return $this->setParam('_timeout', $timeout);
+    }
+
+    /**
+     * @return bool
+     */
+    public function getTimeout()
+    {
+        return $this->getParam('_timeout');
+    }
+
+    /**
+     * @return string
+     */
+    public function hasTimeout()
+    {
+        return $this->hasParam('_timeout');
+    }
+
+    /**
+     * @param string $timeout
+     *
+     * @return $this
+     */
+    public function setConsistency($timeout)
+    {
+        return $this->setParam('_consistency', $timeout);
+    }
+
+    /**
+     * @return string
+     */
+    public function getConsistency()
+    {
+        return $this->getParam('_consistency');
+    }
+
+    /**
+     * @return string
+     */
+    public function hasConsistency()
+    {
+        return $this->hasParam('_consistency');
+    }
+
+    /**
+     * @param string $timeout
+     *
+     * @return $this
+     */
+    public function setReplication($timeout)
+    {
+        return $this->setParam('_replication', $timeout);
+    }
+
+    /**
+     * @return string
+     */
+    public function getReplication()
+    {
+        return $this->getParam('_replication');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasReplication()
+    {
+        return $this->hasParam('_replication');
+    }
+
+    /**
+     * @param \Elastica\Document|array $data
+     *
+     * @return $this
+     */
+    public function setUpsert($data)
+    {
+        $document = Document::create($data);
+        $this->_upsert = $document;
+
+        return $this;
+    }
+
+    /**
+     * @return \Elastica\Document
+     */
+    public function getUpsert()
+    {
+        return $this->_upsert;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasUpsert()
+    {
+        return null !== $this->_upsert;
+    }
+
+    /**
+     * @param array $fields         if empty array all options will be returned, field names can be either with underscored either without, i.e. _percolate, routing
+     * @param bool  $withUnderscore should option keys contain underscore prefix
+     *
+     * @return array
+     */
+    public function getOptions(array $fields = array(), $withUnderscore = false)
+    {
+        if (!empty($fields)) {
+            $data = array();
+            foreach ($fields as $field) {
+                $key = '_'.ltrim($field, '_');
+                if ($this->hasParam($key) && '' !== (string) $this->getParam($key)) {
+                    $data[$key] = $this->getParam($key);
+                }
+            }
+        } else {
+            $data = $this->getParams();
+        }
+        if (!$withUnderscore) {
+            foreach ($data as $key => $value) {
+                $data[ltrim($key, '_')] = $value;
+                unset($data[$key]);
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/AbstractAggregation.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/AbstractAggregation.php
new file mode 100755
index 0000000..6ade6da
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/AbstractAggregation.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Exception\InvalidException;
+use Elastica\NameableInterface;
+use Elastica\Param;
+
+abstract class AbstractAggregation extends Param implements NameableInterface
+{
+    /**
+     * @var string The name of this aggregation
+     */
+    protected $_name;
+
+    /**
+     * @var array Subaggregations belonging to this aggregation
+     */
+    protected $_aggs = array();
+
+    /**
+     * @param string $name the name of this aggregation
+     */
+    public function __construct($name)
+    {
+        $this->setName($name);
+    }
+
+    /**
+     * Set the name of this aggregation.
+     *
+     * @param string $name
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->_name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the name of this aggregation.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Retrieve all subaggregations belonging to this aggregation.
+     *
+     * @return array
+     */
+    public function getAggs()
+    {
+        return $this->_aggs;
+    }
+
+    /**
+     * Add a sub-aggregation.
+     *
+     * @param AbstractAggregation $aggregation
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
+     */
+    public function addAggregation(AbstractAggregation $aggregation)
+    {
+        if ($aggregation instanceof GlobalAggregation) {
+            throw new InvalidException('Global aggregators can only be placed as top level aggregators');
+        }
+
+        $this->_aggs[] = $aggregation;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        if (array_key_exists('global_aggregation', $array)) {
+            // compensate for class name GlobalAggregation
+            $array = array('global' => new \stdClass());
+        }
+        if (sizeof($this->_aggs)) {
+            $array['aggs'] = $this->_convertArrayable($this->_aggs);
+        }
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/AbstractSimpleAggregation.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/AbstractSimpleAggregation.php
new file mode 100755
index 0000000..88210a0
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/AbstractSimpleAggregation.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Exception\InvalidException;
+
+abstract class AbstractSimpleAggregation extends AbstractAggregation
+{
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $field the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', $field);
+    }
+
+    /**
+     * Set a script for this aggregation.
+     *
+     * @param string|\Elastica\Script\AbstractScript $script
+     *
+     * @return $this
+     */
+    public function setScript($script)
+    {
+        return $this->setParam('script', $script);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        if (!$this->hasParam('field') && !$this->hasParam('script')) {
+            throw new InvalidException(
+                'Either the field param or the script param should be set'
+            );
+        }
+        $array = parent::toArray();
+
+        $baseName = $this->_getBaseName();
+
+        if (isset($array[$baseName]['script']) && is_array($array[$baseName]['script'])) {
+            $script = $array[$baseName]['script'];
+
+            unset($array[$baseName]['script']);
+
+            $array[$baseName] = array_merge($array[$baseName], $script);
+        }
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/AbstractTermsAggregation.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/AbstractTermsAggregation.php
new file mode 100755
index 0000000..c2638a1
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/AbstractTermsAggregation.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class AbstractTermsAggregation.
+ */
+abstract class AbstractTermsAggregation extends AbstractSimpleAggregation
+{
+    /**
+     * Set the minimum number of documents in which a term must appear in order to be returned in a bucket.
+     *
+     * @param int $count
+     *
+     * @return $this
+     */
+    public function setMinimumDocumentCount($count)
+    {
+        return $this->setParam('min_doc_count', $count);
+    }
+
+    /**
+     * Filter documents to include based on a regular expression.
+     *
+     * @param string $pattern a regular expression
+     * @param string $flags   Java Pattern flags
+     *
+     * @return $this
+     */
+    public function setInclude($pattern, $flags = null)
+    {
+        if (is_null($flags)) {
+            return $this->setParam('include', $pattern);
+        }
+
+        return $this->setParam('include', array(
+            'pattern' => $pattern,
+            'flags' => $flags,
+        ));
+    }
+
+    /**
+     * Filter documents to exclude based on a regular expression.
+     *
+     * @param string $pattern a regular expression
+     * @param string $flags   Java Pattern flags
+     *
+     * @return $this
+     */
+    public function setExclude($pattern, $flags = null)
+    {
+        if (is_null($flags)) {
+            return $this->setParam('exclude', $pattern);
+        }
+
+        return $this->setParam('exclude', array(
+            'pattern' => $pattern,
+            'flags' => $flags,
+        ));
+    }
+
+    /**
+     * Sets the amount of terms to be returned.
+     *
+     * @param int $size The amount of terms to be returned.
+     *
+     * @return $this
+     */
+    public function setSize($size)
+    {
+        return $this->setParam('size', $size);
+    }
+
+    /**
+     * Sets how many terms the coordinating node will request from each shard.
+     *
+     * @param int $shard_size The amount of terms to be returned.
+     *
+     * @return $this
+     */
+    public function setShardSize($shard_size)
+    {
+        return $this->setParam('shard_size', $shard_size);
+    }
+
+    /**
+     * Instruct Elasticsearch to use direct field data or ordinals of the field values to execute this aggregation.
+     * The execution hint will be ignored if it is not applicable.
+     *
+     * @param string $hint map or ordinals
+     *
+     * @return $this
+     */
+    public function setExecutionHint($hint)
+    {
+        return $this->setParam('execution_hint', $hint);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Avg.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Avg.php
new file mode 100755
index 0000000..73c81cb
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Avg.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Avg.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-avg-aggregation.html
+ */
+class Avg extends AbstractSimpleAggregation
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Cardinality.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Cardinality.php
new file mode 100755
index 0000000..62a0ed4
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Cardinality.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Cardinality.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-cardinality-aggregation.html
+ */
+class Cardinality extends AbstractSimpleAggregation
+{
+    /**
+     * @param int $precisionThreshold
+     *
+     * @return $this
+     */
+    public function setPrecisionThreshold($precisionThreshold)
+    {
+        if (!is_int($precisionThreshold)) {
+            throw new \InvalidArgumentException('precision_threshold only supports integer values');
+        }
+
+        return $this->setParam('precision_threshold', $precisionThreshold);
+    }
+
+    /**
+     * @param bool $rehash
+     *
+     * @return $this
+     */
+    public function setRehash($rehash)
+    {
+        if (!is_bool($rehash)) {
+            throw new \InvalidArgumentException('rehash only supports boolean values');
+        }
+
+        return $this->setParam('rehash', $rehash);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Children.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Children.php
new file mode 100755
index 0000000..bf899ee
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Children.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Children.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/1.7/search-aggregations-bucket-children-aggregation.html
+ */
+class Children extends AbstractAggregation
+{
+    /**
+     * Set the type for this aggregation.
+     *
+     * @param string $field the child type the buckets in the parent space should be mapped to
+     *
+     * @return $this
+     */
+    public function setType($type)
+    {
+        return $this->setParam('type', $type);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/DateHistogram.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/DateHistogram.php
new file mode 100755
index 0000000..78a5d64
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/DateHistogram.php
@@ -0,0 +1,157 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Exception\DeprecatedException;
+
+/**
+ * Class DateHistogram.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-datehistogram-aggregation.html
+ */
+class DateHistogram extends Histogram
+{
+    /**
+     * Set pre-rounding based on interval.
+     *
+     * @deprecated Option "pre_zone" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "time_zone" instead
+     *
+     * @param string $preZone
+     *
+     * @return $this
+     */
+    public function setPreZone($preZone)
+    {
+        throw new DeprecatedException('Option "pre_zone" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "time_zone" instead.');
+    }
+
+    /**
+     * Set post-rounding based on interval.
+     *
+     * @deprecated Option "post_zone" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "time_zone" instead.
+     *
+     * @param string $postZone
+     *
+     * @return $this
+     */
+    public function setPostZone($postZone)
+    {
+        throw new DeprecatedException('Option "post_zone" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "time_zone" instead.');
+    }
+
+    /**
+     * Set time_zone option.
+     *
+     * @param  string
+     *
+     * @return $this
+     */
+    public function setTimezone($timezone)
+    {
+        return $this->setParam('time_zone', $timezone);
+    }
+
+    /**
+     * Set pre-zone adjustment for larger time intervals (day and above).
+     *
+     * @deprecated Option "pre_zone_adjust_large_interval" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "time_zone" instead.
+     *
+     * @param string $adjust
+     *
+     * @return $this
+     */
+    public function setPreZoneAdjustLargeInterval($adjust)
+    {
+        throw new DeprecatedException('Option "pre_zone_adjust_large_interval" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "time_zone" instead.');
+    }
+
+    /**
+     * Adjust for granularity of date data.
+     *
+     * @param int $factor set to 1000 if date is stored in seconds rather than milliseconds
+     *
+     * @return $this
+     */
+    public function setFactor($factor)
+    {
+        return $this->setParam('factor', $factor);
+    }
+
+    /**
+     * Set the offset for pre-rounding.
+     *
+     * @deprecated Option "pre_offset" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "offset" instead.
+     *
+     * @param string $offset "1d", for example
+     *
+     * @return $this
+     */
+    public function setPreOffset($offset)
+    {
+        throw new DeprecatedException('Option "pre_offset" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "offset" instead.');
+    }
+
+    /**
+     * Set the offset for post-rounding.
+     *
+     * @deprecated Option "post_offset" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "offset" instead.
+     *
+     * @param string $offset "1d", for example
+     *
+     * @return $this
+     */
+    public function setPostOffset($offset)
+    {
+        throw new DeprecatedException('Option "post_offset" is deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "offset" instead.');
+    }
+
+    /**
+     * Set offset option.
+     *
+     * @param string
+     *
+     * @return $this
+     */
+    public function setOffset($offset)
+    {
+        return $this->setParam('offset', $offset);
+    }
+
+    /**
+     * Set the format for returned bucket key_as_string values.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/master/search-aggregations-bucket-daterange-aggregation.html#date-format-pattern
+     *
+     * @param string $format see link for formatting options
+     *
+     * @return $this
+     */
+    public function setFormat($format)
+    {
+        return $this->setParam('format', $format);
+    }
+
+    /**
+     * Set extended bounds option.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-histogram-aggregation.html#search-aggregations-bucket-histogram-aggregation-extended-bounds
+     *
+     * @param string $min see link for formatting options
+     * @param string $max see link for formatting options
+     *
+     * @return $this
+     */
+    public function setExtendedBounds($min = '', $max = '')
+    {
+        $bounds = array();
+        $bounds['min'] = $min;
+        $bounds['max'] = $max;
+        // switch if min is higher then max
+        if (strtotime($min) > strtotime($max)) {
+            $bounds['min'] = $max;
+            $bounds['max'] = $min;
+        }
+
+        return $this->setParam('extended_bounds', $bounds);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/DateRange.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/DateRange.php
new file mode 100755
index 0000000..e1e1626
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/DateRange.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class DateRange.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-daterange-aggregation.html
+ */
+class DateRange extends Range
+{
+    /**
+     * Set the formatting for the returned date values.
+     *
+     * @param string $format see documentation for formatting options
+     *
+     * @return $this
+     */
+    public function setFormat($format)
+    {
+        return $this->setParam('format', $format);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ExtendedStats.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ExtendedStats.php
new file mode 100755
index 0000000..a8c2b94
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ExtendedStats.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class ExtendedStats.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-extendedstats-aggregation.html
+ */
+class ExtendedStats extends AbstractSimpleAggregation
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Filter.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Filter.php
new file mode 100755
index 0000000..8650cba
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Filter.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Exception\InvalidException;
+use Elastica\Filter\AbstractFilter;
+use Elastica\Query\AbstractQuery;
+
+/**
+ * Class Filter.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filter-aggregation.html
+ */
+class Filter extends AbstractAggregation
+{
+    /**
+     * @param string        $name
+     * @param AbstractQuery $filter
+     */
+    public function __construct($name, $filter = null)
+    {
+        parent::__construct($name);
+
+        if ($filter !== null) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Aggregation\Filter passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+
+            $this->setFilter($filter);
+        }
+    }
+
+    /**
+     * Set the filter for this aggregation.
+     *
+     * @param AbstractQuery $filter
+     *
+     * @return $this
+     */
+    public function setFilter($filter)
+    {
+        if ($filter instanceof AbstractFilter) {
+            trigger_error('Deprecated: Elastica\Aggregation\Filter\setFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', E_USER_DEPRECATED);
+        } elseif (!($filter instanceof AbstractQuery)) {
+            throw new InvalidException('Filter must be instance of AbstractQuery');
+        }
+
+        return $this->setParam('filter', $filter);
+    }
+
+    /**
+     * @throws \Elastica\Exception\InvalidException If filter is not set
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        if (!$this->hasParam('filter')) {
+            throw new InvalidException('Filter is required');
+        }
+
+        $array = array(
+            'filter' => $this->getParam('filter')->toArray(),
+        );
+
+        if ($this->_aggs) {
+            $array['aggs'] = $this->_convertArrayable($this->_aggs);
+        }
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Filters.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Filters.php
new file mode 100755
index 0000000..920a4f7
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Filters.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Exception\InvalidException;
+use Elastica\Filter\AbstractFilter;
+use Elastica\Query\AbstractQuery;
+
+/**
+ * Class Filters.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filters-aggregation.html
+ */
+class Filters extends AbstractAggregation
+{
+    const NAMED_TYPE = 1;
+    const ANONYMOUS_TYPE = 2;
+
+    /**
+     * @var int Type of bucket keys - named, or anonymous
+     */
+    private $_type = null;
+
+    /**
+     * Add a filter.
+     *
+     * If a name is given, it will be added as a key, otherwise considered as an anonymous filter
+     *
+     * @param AbstractQuery $filter
+     * @param string        $name
+     *
+     * @return $this
+     */
+    public function addFilter($filter, $name = null)
+    {
+        if ($filter instanceof AbstractFilter) {
+            trigger_error('Deprecated: Elastica\Aggregation\Filters\addFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', E_USER_DEPRECATED);
+        } elseif (!($filter instanceof AbstractQuery)) {
+            throw new InvalidException('Filter must be instance of AbstractQuery');
+        }
+
+        if (null !== $name && !is_string($name)) {
+            throw new InvalidException('Name must be a string');
+        }
+
+        $filterArray = array();
+
+        $type = self::NAMED_TYPE;
+
+        if (null === $name) {
+            $filterArray[] = $filter;
+            $type = self::ANONYMOUS_TYPE;
+        } else {
+            $filterArray[$name] = $filter;
+        }
+
+        if ($this->hasParam('filters')
+            && count($this->getParam('filters'))
+            && $this->_type !== $type
+        ) {
+            throw new InvalidException('Mix named and anonymous keys are not allowed');
+        }
+
+        $this->_type = $type;
+
+        return $this->addParam('filters', $filterArray);
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = array();
+        $filters = $this->getParam('filters');
+
+        foreach ($filters as $filter) {
+            if (self::NAMED_TYPE === $this->_type) {
+                $key = key($filter);
+                $array['filters']['filters'][$key] = current($filter)->toArray();
+            } else {
+                $array['filters']['filters'][] = current($filter)->toArray();
+            }
+        }
+
+        if ($this->_aggs) {
+            $array['aggs'] = $this->_convertArrayable($this->_aggs);
+        }
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/GeoDistance.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/GeoDistance.php
new file mode 100755
index 0000000..0c7e32d
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/GeoDistance.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Class GeoDistance.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geodistance-aggregation.html
+ */
+class GeoDistance extends AbstractAggregation
+{
+    const DISTANCE_TYPE_SLOPPY_ARC = 'sloppy_arc';
+    const DISTANCE_TYPE_ARC = 'arc';
+    const DISTANCE_TYPE_PLANE = 'plane';
+
+    /**
+     * @param string       $name   the name if this aggregation
+     * @param string       $field  the field on which to perform this aggregation
+     * @param string|array $origin the point from which distances will be calculated
+     */
+    public function __construct($name, $field, $origin)
+    {
+        parent::__construct($name);
+        $this->setField($field)->setOrigin($origin);
+    }
+
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $field the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', $field);
+    }
+
+    /**
+     * Set the origin point from which distances will be calculated.
+     *
+     * @param string|array $origin valid formats are array("lat" => 52.3760, "lon" => 4.894), "52.3760, 4.894", and array(4.894, 52.3760)
+     *
+     * @return $this
+     */
+    public function setOrigin($origin)
+    {
+        return $this->setParam('origin', $origin);
+    }
+
+    /**
+     * Add a distance range to this aggregation.
+     *
+     * @param int $fromValue a distance
+     * @param int $toValue   a distance
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
+     */
+    public function addRange($fromValue = null, $toValue = null)
+    {
+        if (is_null($fromValue) && is_null($toValue)) {
+            throw new InvalidException('Either fromValue or toValue must be set. Both cannot be null.');
+        }
+
+        $range = array();
+
+        if (!is_null($fromValue)) {
+            $range['from'] = $fromValue;
+        }
+
+        if (!is_null($toValue)) {
+            $range['to'] = $toValue;
+        }
+
+        return $this->addParam('ranges', $range);
+    }
+
+    /**
+     * Set the unit of distance measure for  this aggregation.
+     *
+     * @param string $unit defaults to km
+     *
+     * @return $this
+     */
+    public function setUnit($unit)
+    {
+        return $this->setParam('unit', $unit);
+    }
+
+    /**
+     * Set the method by which distances will be calculated.
+     *
+     * @param string $distanceType see DISTANCE_TYPE_* constants for options. Defaults to sloppy_arc.
+     *
+     * @return $this
+     */
+    public function setDistanceType($distanceType)
+    {
+        return $this->setParam('distance_type', $distanceType);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/GeohashGrid.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/GeohashGrid.php
new file mode 100755
index 0000000..387d0b9
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/GeohashGrid.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class GeohashGrid.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html
+ */
+class GeohashGrid extends AbstractAggregation
+{
+    /**
+     * @param string $name  the name of this aggregation
+     * @param string $field the field on which to perform this aggregation
+     */
+    public function __construct($name, $field)
+    {
+        parent::__construct($name);
+        $this->setField($field);
+    }
+
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $field the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', $field);
+    }
+
+    /**
+     * Set the precision for this aggregation.
+     *
+     * @param int $precision an integer between 1 and 12, inclusive. Defaults to 5.
+     *
+     * @return $this
+     */
+    public function setPrecision($precision)
+    {
+        return $this->setParam('precision', $precision);
+    }
+
+    /**
+     * Set the maximum number of buckets to return.
+     *
+     * @param int $size defaults to 10,000
+     *
+     * @return $this
+     */
+    public function setSize($size)
+    {
+        return $this->setParam('size', $size);
+    }
+
+    /**
+     * Set the number of results returned from each shard.
+     *
+     * @param int $shardSize
+     *
+     * @return $this
+     */
+    public function setShardSize($shardSize)
+    {
+        return $this->setParam('shard_size', $shardSize);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/GlobalAggregation.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/GlobalAggregation.php
new file mode 100755
index 0000000..be3325f
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/GlobalAggregation.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class GlobalAggregation.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-global-aggregation.html
+ */
+class GlobalAggregation extends AbstractAggregation
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Histogram.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Histogram.php
new file mode 100755
index 0000000..bfaf550
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Histogram.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Histogram.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-histogram-aggregation.html
+ */
+class Histogram extends AbstractSimpleAggregation
+{
+    /**
+     * @param string $name     the name of this aggregation
+     * @param string $field    the name of the field on which to perform the aggregation
+     * @param int    $interval the interval by which documents will be bucketed
+     */
+    public function __construct($name, $field, $interval)
+    {
+        parent::__construct($name);
+        $this->setField($field);
+        $this->setInterval($interval);
+    }
+
+    /**
+     * Set the interval by which documents will be bucketed.
+     *
+     * @param int $interval
+     *
+     * @return $this
+     */
+    public function setInterval($interval)
+    {
+        return $this->setParam('interval', $interval);
+    }
+
+    /**
+     * Set the bucket sort order.
+     *
+     * @param string $order     "_count", "_term", or the name of a sub-aggregation or sub-aggregation response field
+     * @param string $direction "asc" or "desc"
+     *
+     * @return $this
+     */
+    public function setOrder($order, $direction)
+    {
+        return $this->setParam('order', array($order => $direction));
+    }
+
+    /**
+     * Set the minimum number of documents which must fall into a bucket in order for the bucket to be returned.
+     *
+     * @param int $count set to 0 to include empty buckets
+     *
+     * @return $this
+     */
+    public function setMinimumDocumentCount($count)
+    {
+        return $this->setParam('min_doc_count', $count);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/IpRange.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/IpRange.php
new file mode 100755
index 0000000..9cbaa2d
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/IpRange.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Class IpRange.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-iprange-aggregation.html
+ */
+class IpRange extends AbstractAggregation
+{
+    /**
+     * @param string $name  the name of this aggregation
+     * @param string $field the field on which to perform this aggregation
+     */
+    public function __construct($name, $field)
+    {
+        parent::__construct($name);
+        $this->setField($field);
+    }
+
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $field the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', $field);
+    }
+
+    /**
+     * Add an ip range to this aggregation.
+     *
+     * @param string $fromValue a valid ipv4 address. Low end of this range, exclusive (greater than)
+     * @param string $toValue   a valid ipv4 address. High end of this range, exclusive (less than)
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
+     */
+    public function addRange($fromValue = null, $toValue = null)
+    {
+        if (is_null($fromValue) && is_null($toValue)) {
+            throw new InvalidException('Either fromValue or toValue must be set. Both cannot be null.');
+        }
+        $range = array();
+        if (!is_null($fromValue)) {
+            $range['from'] = $fromValue;
+        }
+        if (!is_null($toValue)) {
+            $range['to'] = $toValue;
+        }
+
+        return $this->addParam('ranges', $range);
+    }
+
+    /**
+     * Add an ip range in the form of a CIDR mask.
+     *
+     * @param string $mask a valid CIDR mask
+     *
+     * @return $this
+     */
+    public function addMaskRange($mask)
+    {
+        return $this->addParam('ranges', array('mask' => $mask));
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Max.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Max.php
new file mode 100755
index 0000000..8162e18
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Max.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Max.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-max-aggregation.html
+ */
+class Max extends AbstractSimpleAggregation
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Min.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Min.php
new file mode 100755
index 0000000..e84277b
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Min.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Min.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-min-aggregation.html
+ */
+class Min extends AbstractSimpleAggregation
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Missing.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Missing.php
new file mode 100755
index 0000000..4a2ccde
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Missing.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Missing.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-missing-aggregation.html
+ */
+class Missing extends AbstractAggregation
+{
+    /**
+     * @param string $name  the name of this aggregation
+     * @param string $field the field on which to perform this aggregation
+     */
+    public function __construct($name, $field)
+    {
+        parent::__construct($name);
+        $this->setField($field);
+    }
+
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $field the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', $field);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Nested.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Nested.php
new file mode 100755
index 0000000..e3e9269
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Nested.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Nested.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-nested-aggregation.html
+ */
+class Nested extends AbstractAggregation
+{
+    /**
+     * @param string $name the name of this aggregation
+     * @param string $path the nested path for this aggregation
+     */
+    public function __construct($name, $path)
+    {
+        parent::__construct($name);
+        $this->setPath($path);
+    }
+
+    /**
+     * Set the nested path for this aggregation.
+     *
+     * @param string $path
+     *
+     * @return $this
+     */
+    public function setPath($path)
+    {
+        return $this->setParam('path', $path);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Percentiles.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Percentiles.php
new file mode 100755
index 0000000..7a4a8fb
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Percentiles.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Percentiles.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-percentile-aggregation.html
+ */
+class Percentiles extends AbstractSimpleAggregation
+{
+    /**
+     * @param string $name  the name of this aggregation
+     * @param string $field the field on which to perform this aggregation
+     */
+    public function __construct($name, $field = null)
+    {
+        parent::__construct($name);
+
+        if (!is_null($field)) {
+            $this->setField($field);
+        }
+    }
+
+    /**
+     * Set compression parameter.
+     *
+     * @param float $value
+     *
+     * @return $this
+     */
+    public function setCompression($value)
+    {
+        return $this->setParam('compression', (float) $value);
+    }
+
+    /**
+     * Set which percents must be returned.
+     *
+     * @param float[] $percents
+     *
+     * @return $this
+     */
+    public function setPercents(array $percents)
+    {
+        return $this->setParam('percents', $percents);
+    }
+
+    /**
+     * Add yet another percent to result.
+     *
+     * @param float $percent
+     *
+     * @return $this
+     */
+    public function addPercent($percent)
+    {
+        return $this->addParam('percents', (float) $percent);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Range.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Range.php
new file mode 100755
index 0000000..323cc73
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Range.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Class Range.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-range-aggregation.html
+ */
+class Range extends AbstractSimpleAggregation
+{
+    /**
+     * Add a range to this aggregation.
+     *
+     * @param int|float $fromValue low end of this range, exclusive (greater than or equal to)
+     * @param int|float $toValue   high end of this range, exclusive (less than)
+     * @param string    $key       customized key value
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
+     */
+    public function addRange($fromValue = null, $toValue = null, $key = null)
+    {
+        if (is_null($fromValue) && is_null($toValue)) {
+            throw new InvalidException('Either fromValue or toValue must be set. Both cannot be null.');
+        }
+
+        $range = array();
+
+        if (!is_null($fromValue)) {
+            $range['from'] = $fromValue;
+        }
+
+        if (!is_null($toValue)) {
+            $range['to'] = $toValue;
+        }
+
+        if (!is_null($key)) {
+            $range['key'] = $key;
+        }
+
+        return $this->addParam('ranges', $range);
+    }
+
+    /**
+     * If set to true, a unique string key will be associated with each bucket, and ranges will be returned as an associative array.
+     *
+     * @param bool $keyed
+     *
+     * @return $this
+     */
+    public function setKeyedResponse($keyed = true)
+    {
+        return $this->setParam('keyed', (bool) $keyed);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ReverseNested.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ReverseNested.php
new file mode 100755
index 0000000..698c95f
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ReverseNested.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Reversed Nested Aggregation.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-reverse-nested-aggregation.html
+ */
+class ReverseNested extends AbstractAggregation
+{
+    /**
+     * @param string $name The name of this aggregation
+     * @param string $path Optional path to the nested object for this aggregation. Defaults to the root of the main document.
+     */
+    public function __construct($name, $path = null)
+    {
+        parent::__construct($name);
+
+        if ($path !== null) {
+            $this->setPath($path);
+        }
+    }
+
+    /**
+     * Set the nested path for this aggregation.
+     *
+     * @param string $path
+     *
+     * @return $this
+     */
+    public function setPath($path)
+    {
+        return $this->setParam('path', $path);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        // ensure we have an object for the reverse_nested key.
+        // if we don't have a path, then this would otherwise get encoded as an empty array, which is invalid.
+        $array['reverse_nested'] = (object) $array['reverse_nested'];
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ScriptedMetric.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ScriptedMetric.php
new file mode 100755
index 0000000..5be54b6
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ScriptedMetric.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class ScriptedMetric.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-scripted-metric-aggregation.html
+ */
+class ScriptedMetric extends AbstractAggregation
+{
+    /**
+     * @param string      $name          the name if this aggregation
+     * @param string|null $initScript    Executed prior to any collection of documents
+     * @param string|null $mapScript     Executed once per document collected
+     * @param string|null $combineScript Executed once on each shard after document collection is complete
+     * @param string|null $reduceScript  Executed once on the coordinating node after all shards have returned their results
+     */
+    public function __construct($name, $initScript = null, $mapScript = null, $combineScript = null, $reduceScript = null)
+    {
+        parent::__construct($name);
+        if ($initScript) {
+            $this->setInitScript($initScript);
+        }
+        if ($mapScript) {
+            $this->setMapScript($mapScript);
+        }
+        if ($combineScript) {
+            $this->setCombineScript($combineScript);
+        }
+        if ($reduceScript) {
+            $this->setReduceScript($reduceScript);
+        }
+    }
+
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $script the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setCombineScript($script)
+    {
+        return $this->setParam('combine_script', $script);
+    }
+
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $script the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setInitScript($script)
+    {
+        return $this->setParam('init_script', $script);
+    }
+
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $script the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setMapScript($script)
+    {
+        return $this->setParam('map_script', $script);
+    }
+
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $script the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setReduceScript($script)
+    {
+        return $this->setParam('reduce_script', $script);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/SignificantTerms.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/SignificantTerms.php
new file mode 100755
index 0000000..1a1b123
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/SignificantTerms.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Exception\InvalidException;
+use Elastica\Filter\AbstractFilter;
+use Elastica\Query\AbstractQuery;
+
+/**
+ * Class SignificantTerms.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-significantterms-aggregation.html
+ */
+class SignificantTerms extends AbstractTermsAggregation
+{
+    /**
+     * The default source of statistical information for background term frequencies is the entire index and this scope can
+     * be narrowed through the use of a background_filter to focus in on significant terms within a narrower context.
+     *
+     * @param AbstractQuery $filter
+     *
+     * @return $this
+     *
+     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-significantterms-aggregation.html#_custom_background_context
+     */
+    public function setBackgroundFilter($filter)
+    {
+        if ($filter instanceof AbstractFilter) {
+            trigger_error('Deprecated: Elastica\Aggregation\SignificantTerms::setBackgroundFilter passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', E_USER_DEPRECATED);
+        } elseif (!($filter instanceof AbstractQuery)) {
+            throw new InvalidException('Filter must be instance of AbstractQuery');
+        }
+
+        return $this->setParam('background_filter', $filter);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Stats.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Stats.php
new file mode 100755
index 0000000..25940d3
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Stats.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Stats.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-stats-aggregation.html
+ */
+class Stats extends AbstractSimpleAggregation
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Sum.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Sum.php
new file mode 100755
index 0000000..87b2f29
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Sum.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Sum.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-sum-aggregation.html
+ */
+class Sum extends AbstractSimpleAggregation
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Terms.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Terms.php
new file mode 100755
index 0000000..e42da66
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/Terms.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class Terms.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-terms-aggregation.html
+ */
+class Terms extends AbstractTermsAggregation
+{
+    /**
+     * Set the bucket sort order.
+     *
+     * @param string $order     "_count", "_term", or the name of a sub-aggregation or sub-aggregation response field
+     * @param string $direction "asc" or "desc"
+     *
+     * @return $this
+     */
+    public function setOrder($order, $direction)
+    {
+        return $this->setParam('order', array($order => $direction));
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/TopHits.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/TopHits.php
new file mode 100755
index 0000000..5f51f88
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/TopHits.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+use Elastica\Script\AbstractScript;
+use Elastica\Script\ScriptFields;
+
+/**
+ * Class TopHits.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-top-hits-aggregation.html
+ */
+class TopHits extends AbstractAggregation
+{
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        // if there are no params, it's ok, but ES will throw exception if json
+        // will be like {"top_hits":[]} instead of {"top_hits":{}}
+        if (empty($array['top_hits'])) {
+            $array['top_hits'] = new \stdClass();
+        }
+
+        return $array;
+    }
+
+    /**
+     * The maximum number of top matching hits to return per bucket. By default the top three matching hits are returned.
+     *
+     * @param int $size
+     *
+     * @return $this
+     */
+    public function setSize($size)
+    {
+        return $this->setParam('size', (int) $size);
+    }
+
+    /**
+     * The offset from the first result you want to fetch.
+     *
+     * @param int $from
+     *
+     * @return $this
+     */
+    public function setFrom($from)
+    {
+        return $this->setParam('from', (int) $from);
+    }
+
+    /**
+     * How the top matching hits should be sorted. By default the hits are sorted by the score of the main query.
+     *
+     * @param array $sortArgs
+     *
+     * @return $this
+     */
+    public function setSort(array $sortArgs)
+    {
+        return $this->setParam('sort', $sortArgs);
+    }
+
+    /**
+     * Allows to control how the _source field is returned with every hit.
+     *
+     * @param array|bool $params Fields to be returned or false to disable source
+     *
+     * @return $this
+     */
+    public function setSource($params)
+    {
+        return $this->setParam('_source', $params);
+    }
+
+    /**
+     * Returns a version for each search hit.
+     *
+     * @param bool $version
+     *
+     * @return $this
+     */
+    public function setVersion($version)
+    {
+        return $this->setParam('version', (bool) $version);
+    }
+
+    /**
+     * Enables explanation for each hit on how its score was computed.
+     *
+     * @param bool $explain
+     *
+     * @return $this
+     */
+    public function setExplain($explain)
+    {
+        return $this->setParam('explain', (bool) $explain);
+    }
+
+    /**
+     * Set script fields.
+     *
+     * @param array|\Elastica\Script\ScriptFields $scriptFields
+     *
+     * @return $this
+     */
+    public function setScriptFields($scriptFields)
+    {
+        if (is_array($scriptFields)) {
+            $scriptFields = new ScriptFields($scriptFields);
+        }
+
+        return $this->setParam('script_fields', $scriptFields);
+    }
+
+    /**
+     * Adds a Script to the aggregation.
+     *
+     * @param string                          $name
+     * @param \Elastica\Script\AbstractScript $script
+     *
+     * @return $this
+     */
+    public function addScriptField($name, AbstractScript $script)
+    {
+        if (!isset($this->_params['script_fields'])) {
+            $this->_params['script_fields'] = new ScriptFields();
+        }
+
+        $this->_params['script_fields']->addScript($name, $script);
+
+        return $this;
+    }
+
+    /**
+     * Sets highlight arguments for the results.
+     *
+     * @param array $highlightArgs
+     *
+     * @return $this
+     */
+    public function setHighlight(array $highlightArgs)
+    {
+        return $this->setParam('highlight', $highlightArgs);
+    }
+
+    /**
+     * Allows to return the field data representation of a field for each hit.
+     *
+     * @param array $fields
+     *
+     * @return $this
+     */
+    public function setFieldDataFields(array $fields)
+    {
+        return $this->setParam('fielddata_fields', $fields);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ValueCount.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ValueCount.php
new file mode 100755
index 0000000..ce3662a
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Aggregation/ValueCount.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Elastica\Aggregation;
+
+/**
+ * Class ValueCount.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-valuecount-aggregation.html
+ */
+class ValueCount extends AbstractAggregation
+{
+    /**
+     * @param string $name  the name of this aggregation
+     * @param string $field the field on which to perform this aggregation
+     */
+    public function __construct($name, $field)
+    {
+        parent::__construct($name);
+        $this->setField($field);
+    }
+
+    /**
+     * Set the field for this aggregation.
+     *
+     * @param string $field the name of the document field on which to perform this aggregation
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', $field);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ArrayableInterface.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ArrayableInterface.php
new file mode 100755
index 0000000..1f92e8a
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ArrayableInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Elastica;
+
+/**
+ * Interface for params.
+ *
+ *
+ * @author Evgeniy Sokolov <ewgraf@gmail.com>
+ */
+interface ArrayableInterface
+{
+    /**
+     * Converts the object to an array.
+     *
+     * @return array Object as array
+     */
+    public function toArray();
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk.php
index 6b0a2f3..a75bb82 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk.php
@@ -2,27 +2,18 @@
 
 namespace Elastica;
 
-use Elastica\Document;
-use Elastica\Exception\Bulk\ResponseException as BulkResponseException;
-use Elastica\Exception\Bulk\UdpException;
-use Elastica\Exception\InvalidException;
-use Elastica\Request;
-use Elastica\Response;
-use Elastica\Client;
-use Elastica\Index;
-use Elastica\Type;
 use Elastica\Bulk\Action;
 use Elastica\Bulk\Action\AbstractDocument as AbstractDocumentAction;
-use Elastica\Bulk\ResponseSet;
 use Elastica\Bulk\Response as BulkResponse;
+use Elastica\Bulk\ResponseSet;
+use Elastica\Exception\Bulk\ResponseException as BulkResponseException;
+use Elastica\Exception\InvalidException;
+use Elastica\Script\AbstractScript;
 
 class Bulk
 {
     const DELIMITER = "\n";
 
-    const UDP_DEFAULT_HOST = 'localhost';
-    const UDP_DEFAULT_PORT = 9700;
-
     /**
      * @var \Elastica\Client
      */
@@ -43,6 +34,11 @@ class Bulk
      */
     protected $_type = '';
 
+    /**
+     * @var array request parameters to the bulk api
+     */
+    protected $_requestParams = array();
+
     /**
      * @param \Elastica\Client $client
      */
@@ -53,7 +49,8 @@ public function __construct(Client $client)
 
     /**
      * @param string|\Elastica\Index $index
-     * @return \Elastica\Bulk
+     *
+     * @return $this
      */
     public function setIndex($index)
     {
@@ -84,7 +81,8 @@ public function hasIndex()
 
     /**
      * @param string|\Elastica\Type $type
-     * @return \Elastica\Bulk
+     *
+     * @return $this
      */
     public function setType($type)
     {
@@ -119,30 +117,34 @@ public function hasType()
      */
     public function getPath()
     {
-        $path = '/';
+        $path = '';
         if ($this->hasIndex()) {
-            $path.= $this->getIndex() . '/';
+            $path .= $this->getIndex().'/';
             if ($this->hasType()) {
-                $path.= $this->getType() . '/';
+                $path .= $this->getType().'/';
             }
         }
-        $path.= '_bulk';
+        $path .= '_bulk';
+
         return $path;
     }
 
     /**
      * @param \Elastica\Bulk\Action $action
-     * @return \Elastica\Bulk
+     *
+     * @return $this
      */
     public function addAction(Action $action)
     {
         $this->_actions[] = $action;
+
         return $this;
     }
 
     /**
      * @param \Elastica\Bulk\Action[] $actions
-     * @return \Elastica\Bulk
+     *
+     * @return $this
      */
     public function addActions(array $actions)
     {
@@ -163,8 +165,9 @@ public function getActions()
 
     /**
      * @param \Elastica\Document $document
-     * @param string $opType
-     * @return \Elastica\Bulk
+     * @param string             $opType
+     *
+     * @return $this
      */
     public function addDocument(Document $document, $opType = null)
     {
@@ -175,8 +178,9 @@ public function addDocument(Document $document, $opType = null)
 
     /**
      * @param \Elastica\Document[] $documents
-     * @param string $opType
-     * @return \Elastica\Bulk
+     * @param string               $opType
+     *
+     * @return $this
      */
     public function addDocuments(array $documents, $opType = null)
     {
@@ -188,11 +192,12 @@ public function addDocuments(array $documents, $opType = null)
     }
 
     /**
-     * @param \Elastica\Script $data
-     * @param string $opType
-     * @return \Elastica\Bulk
+     * @param \Elastica\Script\AbstractScript $script
+     * @param string                          $opType
+     *
+     * @return $this
      */
-    public function addScript(Script $script, $opType = null)
+    public function addScript(AbstractScript $script, $opType = null)
     {
         $action = AbstractDocumentAction::create($script, $opType);
 
@@ -201,8 +206,9 @@ public function addScript(Script $script, $opType = null)
 
     /**
      * @param \Elastica\Document[] $scripts
-     * @param string $opType
-     * @return \Elastica\Bulk
+     * @param string               $opType
+     *
+     * @return $this
      */
     public function addScripts(array $scripts, $opType = null)
     {
@@ -214,24 +220,24 @@ public function addScripts(array $scripts, $opType = null)
     }
 
     /**
-     * @param \Elastica\Script|\Elastica\Document\array $data
-     * @param string $opType
-     * @return \Elastica\Bulk
+     * @param \Elastica\Script\AbstractScript|\Elastica\Document|array $data
+     * @param string                                                   $opType
+     *
+     * @return $this
      */
     public function addData($data, $opType = null)
     {
-        if(!is_array($data)){
+        if (!is_array($data)) {
             $data = array($data);
         }
 
-        foreach ($data as $actionData){
-
-            if ($actionData instanceOf Script) {
+        foreach ($data as $actionData) {
+            if ($actionData instanceof AbstractScript) {
                 $this->addScript($actionData, $opType);
-            }else if ($actionData instanceof Document) {
+            } elseif ($actionData instanceof Document) {
                 $this->addDocument($actionData, $opType);
-            }else{
-                throw new \InvalidArgumentException("Data should be a Document, a Script or an array containing Documents and/or Scripts");
+            } else {
+                throw new \InvalidArgumentException('Data should be a Document, a Script or an array containing Documents and/or Scripts');
             }
         }
 
@@ -240,8 +246,10 @@ public function addData($data, $opType = null)
 
     /**
      * @param array $data
-     * @return \Elastica\Bulk
+     *
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
      */
     public function addRawData(array $data)
     {
@@ -275,6 +283,34 @@ public function addRawData(array $data)
         return $this;
     }
 
+    /**
+     * Set a url parameter on the request bulk request.
+     *
+     * @param string $name  name of the parameter
+     * @param string $value value of the parameter
+     *
+     * @return $this
+     */
+    public function setRequestParam($name, $value)
+    {
+        $this->_requestParams[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Set the amount of time that the request will wait the shards to come on line.
+     * Requires Elasticsearch version >= 0.90.8.
+     *
+     * @param string $time timeout in Elasticsearch time format
+     *
+     * @return $this
+     */
+    public function setShardTimeout($time)
+    {
+        return $this->setRequestParam('timeout', $time);
+    }
+
     /**
      * @return string
      */
@@ -290,8 +326,9 @@ public function toString()
     {
         $data = '';
         foreach ($this->getActions() as $action) {
-            $data.= $action->toString();
+            $data .= $action->toString();
         }
+
         return $data;
     }
 
@@ -306,6 +343,7 @@ public function toArray()
                 $data[] = $row;
             }
         }
+
         return $data;
     }
 
@@ -317,15 +355,17 @@ public function send()
         $path = $this->getPath();
         $data = $this->toString();
 
-        $response = $this->_client->request($path, Request::PUT, $data);
+        $response = $this->_client->request($path, Request::POST, $data, $this->_requestParams);
 
         return $this->_processResponse($response);
     }
 
     /**
      * @param \Elastica\Response $response
-     * @throws Exception\Bulk\ResponseException
-     * @throws Exception\InvalidException
+     *
+     * @throws \Elastica\Exception\Bulk\ResponseException
+     * @throws \Elastica\Exception\InvalidException
+     *
      * @return \Elastica\Bulk\ResponseSet
      */
     protected function _processResponse(Response $response)
@@ -338,9 +378,8 @@ protected function _processResponse(Response $response)
 
         if (isset($responseData['items']) && is_array($responseData['items'])) {
             foreach ($responseData['items'] as $key => $item) {
-
                 if (!isset($actions[$key])) {
-                    throw new InvalidException('No response found for action #' . $key);
+                    throw new InvalidException('No response found for action #'.$key);
                 }
 
                 $action = $actions[$key];
@@ -374,27 +413,4 @@ protected function _processResponse(Response $response)
 
         return $bulkResponseSet;
     }
-
-    /**
-     * @param string $host
-     * @param int $port
-     * @throws \Elastica\Exception\Bulk\UdpException
-     */
-    public function sendUdp($host = null, $port = null)
-    {
-        if (null === $host) {
-            $host = $this->_client->getConfigValue(array('udp', 'host'), self::UDP_DEFAULT_HOST);
-        }
-        if (null === $port) {
-            $port = $this->_client->getConfigValue(array('udp', 'port'), self::UDP_DEFAULT_PORT);
-        }
-
-        $message = $this->toString();
-        $socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-        $result = socket_sendto($socket, $message, strlen($message), 0, $host, $port);
-        socket_close($socket);
-        if (false === $result) {
-            throw new UdpException('UDP request failed');
-        }
-    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action.php
index 83a42c7..afbc2fc 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action.php
@@ -4,12 +4,13 @@
 
 use Elastica\Bulk;
 use Elastica\Index;
+use Elastica\JSON;
 use Elastica\Type;
 
 class Action
 {
     const OP_TYPE_CREATE = 'create';
-    const OP_TYPE_INDEX  = 'index';
+    const OP_TYPE_INDEX = 'index';
     const OP_TYPE_DELETE = 'delete';
     const OP_TYPE_UPDATE = 'update';
 
@@ -20,7 +21,7 @@ class Action
         self::OP_TYPE_CREATE,
         self::OP_TYPE_INDEX,
         self::OP_TYPE_DELETE,
-        self::OP_TYPE_UPDATE
+        self::OP_TYPE_UPDATE,
     );
 
     /**
@@ -40,8 +41,8 @@ class Action
 
     /**
      * @param string $opType
-     * @param array $metadata
-     * @param array $source
+     * @param array  $metadata
+     * @param array  $source
      */
     public function __construct($opType = self::OP_TYPE_INDEX, array $metadata = array(), array $source = array())
     {
@@ -52,7 +53,8 @@ public function __construct($opType = self::OP_TYPE_INDEX, array $metadata = arr
 
     /**
      * @param string $type
-     * @return \Elastica\Bulk\Action
+     *
+     * @return $this
      */
     public function setOpType($type)
     {
@@ -71,7 +73,8 @@ public function getOpType()
 
     /**
      * @param array $metadata
-     * @return \Elastica\Bulk\Action
+     *
+     * @return $this
      */
     public function setMetadata(array $metadata)
     {
@@ -98,7 +101,8 @@ public function getActionMetadata()
 
     /**
      * @param array $source
-     * @return \Elastica\Bulk\Action
+     *
+     * @return $this
      */
     public function setSource($source)
     {
@@ -125,7 +129,8 @@ public function hasSource()
 
     /**
      * @param string|\Elastica\Index $index
-     * @return \Elastica\Bulk\Action
+     *
+     * @return $this
      */
     public function setIndex($index)
     {
@@ -139,7 +144,8 @@ public function setIndex($index)
 
     /**
      * @param string|\Elastica\Type $type
-     * @return \Elastica\Bulk\Action
+     *
+     * @return $this
      */
     public function setType($type)
     {
@@ -154,7 +160,8 @@ public function setType($type)
 
     /**
      * @param string $id
-     * @return \Elastica\Bulk\Action
+     *
+     * @return $this
      */
     public function setId($id)
     {
@@ -163,6 +170,18 @@ public function setId($id)
         return $this;
     }
 
+    /**
+     * @param string $routing
+     *
+     * @return $this
+     */
+    public function setRouting($routing)
+    {
+        $this->_metadata['_routing'] = $routing;
+
+        return $this;
+    }
+
     /**
      * @return array
      */
@@ -172,6 +191,7 @@ public function toArray()
         if ($this->hasSource()) {
             $data[] = $this->getSource();
         }
+
         return $data;
     }
 
@@ -180,21 +200,26 @@ public function toArray()
      */
     public function toString()
     {
-        $string = json_encode($this->getActionMetadata(), JSON_FORCE_OBJECT) . Bulk::DELIMITER;
+        $string = JSON::stringify($this->getActionMetadata(), JSON_FORCE_OBJECT).Bulk::DELIMITER;
         if ($this->hasSource()) {
             $source = $this->getSource();
             if (is_string($source)) {
-                $string.= $source;
+                $string .= $source;
+            } elseif (is_array($source) && array_key_exists('doc', $source) && is_string($source['doc'])) {
+                $docAsUpsert = (isset($source['doc_as_upsert'])) ? ', "doc_as_upsert": '.$source['doc_as_upsert'] : '';
+                $string .= '{"doc": '.$source['doc'].$docAsUpsert.'}';
             } else {
-                $string.= json_encode($source);
+                $string .= JSON::stringify($source, 'JSON_ELASTICSEARCH');
             }
-            $string.= Bulk::DELIMITER;
+            $string .= Bulk::DELIMITER;
         }
+
         return $string;
     }
 
     /**
      * @param string $opType
+     *
      * @return bool
      */
     public static function isValidOpType($opType)
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/AbstractDocument.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/AbstractDocument.php
index a143a56..10096cb 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/AbstractDocument.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/AbstractDocument.php
@@ -2,19 +2,20 @@
 
 namespace Elastica\Bulk\Action;
 
+use Elastica\AbstractUpdateAction;
 use Elastica\Bulk\Action;
 use Elastica\Document;
-use Elastica\Script;
+use Elastica\Script\AbstractScript;
 
 abstract class AbstractDocument extends Action
 {
     /**
-     * @var \Elastica\Document|\Elastica\Script
+     * @var \Elastica\Document|\Elastica\Script\AbstractScript
      */
     protected $_data;
 
     /**
-     * @param \Elastica\Document|\Elastica\Script $document
+     * @param \Elastica\Document|\Elastica\Script\AbstractScript $document
      */
     public function __construct($document)
     {
@@ -23,13 +24,14 @@ public function __construct($document)
 
     /**
      * @param \Elastica\Document $document
-     * @return \Elastica\Bulk\Action\AbstractDocument
+     *
+     * @return $this
      */
     public function setDocument(Document $document)
     {
         $this->_data = $document;
 
-        $metadata = $this->_getMetadataByDocument($document);
+        $metadata = $this->_getMetadata($document);
 
         $this->setMetadata($metadata);
 
@@ -37,40 +39,39 @@ public function setDocument(Document $document)
     }
 
     /**
-     * @param \Elastica\Script $script
-     * @return \Elastica\Bulk\Action\AbstractDocument
+     * @param \Elastica\Script\AbstractScript $script
+     *
+     * @return $this
      */
-    public function setScript(Script $script)
+    public function setScript(AbstractScript $script)
     {
         if (!($this instanceof UpdateDocument)) {
-            throw new \BadMethodCallException("setScript() can only be used for UpdateDocument");
+            throw new \BadMethodCallException('setScript() can only be used for UpdateDocument');
         }
 
         $this->_data = $script;
 
-        $metadata = $this->_getMetadataByScript($script);
+        $metadata = $this->_getMetadata($script);
         $this->setMetadata($metadata);
 
         return $this;
     }
 
     /**
-     * @param \Elastica\Script|\Elastica\Document $data
+     * @param \Elastica\Script\AbstractScript|\Elastica\Document $data
+     *
      * @throws \InvalidArgumentException
-     * @return \Elastica\Bulk\Action\AbstractDocument
+     *
+     * @return $this
      */
     public function setData($data)
     {
-        if ($data instanceof Script) {
-
+        if ($data instanceof AbstractScript) {
             $this->setScript($data);
-
-        }else if ($data instanceof Document) {
-
+        } elseif ($data instanceof Document) {
             $this->setDocument($data);
-
-        }else{
-            throw new \InvalidArgumentException("Data should be a Document or a Script.");
+        } else {
+            throw new \InvalidArgumentException('Data should be a Document or a Script.');
         }
 
         return $this;
@@ -78,7 +79,8 @@ public function setData($data)
 
     /**
      * Note: This is for backwards compatibility.
-     * @return \Elastica\Document
+     *
+     * @return \Elastica\Document|null
      */
     public function getDocument()
     {
@@ -86,24 +88,25 @@ public function getDocument()
             return $this->_data;
         }
 
-        return null;
+        return;
     }
 
     /**
      * Note: This is for backwards compatibility.
-     * @return \Elastica\Script
+     *
+     * @return \Elastica\Script\AbstractScript|null
      */
     public function getScript()
     {
-        if ($this->_data instanceof Script) {
+        if ($this->_data instanceof AbstractScript) {
             return $this->_data;
         }
 
-        return null;
+        return;
     }
 
     /**
-     * @return \Elastica\Document|\Elastica\Script
+     * @return \Elastica\Document|\Elastica\Script\AbstractScript
      */
     public function getData()
     {
@@ -111,38 +114,36 @@ public function getData()
     }
 
     /**
-     * @param \Elastica\Document $document
-     * @return array
-     */
-    abstract protected function _getMetadataByDocument(Document $document);
-
-    /**
-     * @param \Elastica\Script $script
+     * @param \Elastica\AbstractUpdateAction $source
+     *
      * @return array
      */
-    protected function _getMetadataByScript(Script $script)
-    {
-    }
+    abstract protected function _getMetadata(AbstractUpdateAction $source);
 
     /**
-     * @param \Elastica\Document|\Elastica\Script $data
-     * @param string $opType
-     * @return \Elastica\Bulk\Action\AbstractDocument
+     * @param \Elastica\Document|\Elastica\Script\AbstractScript $data
+     * @param string                                             $opType
+     *
+     * @return static
      */
     public static function create($data, $opType = null)
     {
-    	//Check type
-    	if (!($data instanceof Document) && !($data instanceof Script)) {
-    		throw new \InvalidArgumentException("The data needs to be a Document or a Script.");
-    	}
-    	
+        //Check type
+        if (!($data instanceof Document) && !($data instanceof AbstractScript)) {
+            throw new \InvalidArgumentException('The data needs to be a Document or a Script.');
+        }
+
         if (null === $opType && $data->hasOpType()) {
             $opType = $data->getOpType();
         }
 
         //Check that scripts can only be used for updates
-        if ($data instanceof Script  && isset($opType) && $opType != self::OP_TYPE_UPDATE) {
-            throw new \InvalidArgumentException("When performing an update action, the data needs to be a Document or a Script.");
+        if ($data instanceof AbstractScript) {
+            if ($opType === null) {
+                $opType = self::OP_TYPE_UPDATE;
+            } elseif ($opType != self::OP_TYPE_UPDATE) {
+                throw new \InvalidArgumentException('Scripts can only be used with the update operation type.');
+            }
         }
 
         switch ($opType) {
@@ -160,6 +161,7 @@ public static function create($data, $opType = null)
                 $action = new IndexDocument($data);
                 break;
         }
+
         return $action;
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/DeleteDocument.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/DeleteDocument.php
index 5e46d78..8ae3cda 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/DeleteDocument.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/DeleteDocument.php
@@ -2,7 +2,7 @@
 
 namespace Elastica\Bulk\Action;
 
-use Elastica\Document;
+use Elastica\AbstractUpdateAction;
 
 class DeleteDocument extends AbstractDocument
 {
@@ -12,10 +12,11 @@ class DeleteDocument extends AbstractDocument
     protected $_opType = self::OP_TYPE_DELETE;
 
     /**
-     * @param \Elastica\Document $document
+     * @param \Elastica\AbstractUpdateAction $action
+     *
      * @return array
      */
-    protected function _getMetadataByDocument(Document $document)
+    protected function _getMetadata(AbstractUpdateAction $action)
     {
         $params = array(
             'index',
@@ -24,9 +25,9 @@ protected function _getMetadataByDocument(Document $document)
             'version',
             'version_type',
             'routing',
-            'parent'
+            'parent',
         );
-        $metadata = $document->getOptions($params, true);
+        $metadata = $action->getOptions($params, true);
 
         return $metadata;
     }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/IndexDocument.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/IndexDocument.php
index 099e90b..3a412cf 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/IndexDocument.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/IndexDocument.php
@@ -2,7 +2,7 @@
 
 namespace Elastica\Bulk\Action;
 
-use Elastica\Bulk\Action;
+use Elastica\AbstractUpdateAction;
 use Elastica\Document;
 
 class IndexDocument extends AbstractDocument
@@ -14,7 +14,8 @@ class IndexDocument extends AbstractDocument
 
     /**
      * @param \Elastica\Document $document
-     * @return \Elastica\Bulk\Action\IndexDocument
+     *
+     * @return $this
      */
     public function setDocument(Document $document)
     {
@@ -26,10 +27,11 @@ public function setDocument(Document $document)
     }
 
     /**
-     * @param \Elastica\Document $document
+     * @param \Elastica\AbstractUpdateAction $action
+     *
      * @return array
      */
-    protected function _getMetadataByDocument(Document $document)
+    protected function _getMetadata(AbstractUpdateAction $action)
     {
         $params = array(
             'index',
@@ -38,12 +40,13 @@ protected function _getMetadataByDocument(Document $document)
             'version',
             'version_type',
             'routing',
-            'percolate',
             'parent',
             'ttl',
             'timestamp',
+            'retry_on_conflict',
         );
-        $metadata = $document->getOptions($params, true);
+
+        $metadata = $action->getOptions($params, true);
 
         return $metadata;
     }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/UpdateDocument.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/UpdateDocument.php
index 1f06d38..e5a72c5 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/UpdateDocument.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Action/UpdateDocument.php
@@ -3,12 +3,8 @@
 namespace Elastica\Bulk\Action;
 
 use Elastica\Document;
-use Elastica\Script;
+use Elastica\Script\AbstractScript;
 
-/**
- * @package Elastica\Bulk\Action
- * @link http://www.elasticsearch.org/guide/reference/api/bulk/
- */
 class UpdateDocument extends IndexDocument
 {
     /**
@@ -18,8 +14,10 @@ class UpdateDocument extends IndexDocument
 
     /**
      * Set the document for this bulk update action.
+     *
      * @param \Elastica\Document $document
-     * @return \Elastica\Bulk\Action\UpdateDocument
+     *
+     * @return $this
      */
     public function setDocument(Document $document)
     {
@@ -28,10 +26,8 @@ public function setDocument(Document $document)
         $source = array('doc' => $document->getData());
 
         if ($document->getDocAsUpsert()) {
-        	$source['doc_as_upsert'] = true;
-        	
-        }else if ($document->hasUpsert()) {
-        	
+            $source['doc_as_upsert'] = true;
+        } elseif ($document->hasUpsert()) {
             $upsert = $document->getUpsert()->getData();
 
             if (!empty($upsert)) {
@@ -45,13 +41,15 @@ public function setDocument(Document $document)
     }
 
     /**
-     * @param \Elastica\Script $script
-     * @return \Elastica\Bulk\Action\AbstractDocument
+     * @param \Elastica\Script\AbstractScript $script
+     *
+     * @return $this
      */
-    public function setScript(Script $script)
+    public function setScript(AbstractScript $script)
     {
         parent::setScript($script);
 
+        // FIXME: can we throw away toArray cast?
         $source = $script->toArray();
 
         if ($script->hasUpsert()) {
@@ -66,27 +64,4 @@ public function setScript(Script $script)
 
         return $this;
     }
-
-    /**
-     * @param \Elastica\Script $script
-     * @return array
-     */
-    protected function _getMetadataByScript(Script $script)
-    {
-        $params = array(
-                'index',
-                'type',
-                'id',
-                'version',
-                'version_type',
-                'routing',
-                'percolate',
-                'parent',
-                'ttl',
-                'timestamp',
-        );
-        $metadata = $script->getOptions($params, true);
-
-        return $metadata;
-    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Response.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Response.php
index 5abd185..73afb68 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Response.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/Response.php
@@ -17,9 +17,9 @@ class Response extends BaseResponse
     protected $_opType;
 
     /**
-     * @param array|string $responseData
+     * @param array|string          $responseData
      * @param \Elastica\Bulk\Action $action
-     * @param string $opType
+     * @param string                $opType
      */
     public function __construct($responseData, Action $action, $opType)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/ResponseSet.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/ResponseSet.php
index 9fd835e..6760bd0 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/ResponseSet.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Bulk/ResponseSet.php
@@ -17,7 +17,7 @@ class ResponseSet extends BaseResponse implements \Iterator, \Countable
     protected $_position = 0;
 
     /**
-     * @param \Elastica\Response $response
+     * @param \Elastica\Response        $response
      * @param \Elastica\Bulk\Response[] $bulkResponses
      */
     public function __construct(BaseResponse $response, array $bulkResponses)
@@ -36,7 +36,7 @@ public function getBulkResponses()
     }
 
     /**
-     * Returns first found error
+     * Returns first found error.
      *
      * @return string
      */
@@ -54,6 +54,25 @@ public function getError()
         return $error;
     }
 
+    /**
+     * Returns first found error (full array).
+     *
+     * @return array|string
+     */
+    public function getFullError()
+    {
+        $error = '';
+
+        foreach ($this->getBulkResponses() as $bulkResponse) {
+            if ($bulkResponse->hasError()) {
+                $error = $bulkResponse->getFullError();
+                break;
+            }
+        }
+
+        return $error;
+    }
+
     /**
      * @return bool
      */
@@ -101,11 +120,10 @@ public function current()
     }
 
     /**
-     *
      */
     public function next()
     {
-        $this->_position++;
+        ++$this->_position;
     }
 
     /**
@@ -125,7 +143,6 @@ public function valid()
     }
 
     /**
-     *
      */
     public function rewind()
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Client.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Client.php
index dc1617e..2e8e11c 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Client.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Client.php
@@ -2,56 +2,56 @@
 
 namespace Elastica;
 
-use Elastica\Bulk;
 use Elastica\Bulk\Action;
-use Elastica\Exception\ResponseException;
-use Elastica\Exception\ClientException;
 use Elastica\Exception\ConnectionException;
 use Elastica\Exception\InvalidException;
-use Elastica\Exception\RuntimeException;
+use Elastica\Script\AbstractScript;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 /**
- * Client to connect the the elasticsearch server
+ * Client to connect the the elasticsearch server.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class Client
 {
     /**
-     * Config with defaults
+     * Config with defaults.
      *
      * log: Set to true, to enable logging, set a string to log to a specific file
      * retryOnConflict: Use in \Elastica\Client::updateDocument
+     * bigintConversion: Set to true to enable the JSON bigint to string conversion option (see issue #717)
      *
      * @var array
      */
     protected $_config = array(
-        'host'            => null,
-        'port'            => null,
-        'path'            => null,
-        'url'             => null,
-        'proxy'           => null,
-        'transport'       => null,
-        'persistent'      => true,
-        'timeout'         => null,
-        'connections'     => array(), // host, port, path, timeout, transport, persistent, timeout, config -> (curl, headers, url)
-        'roundRobin'      => false,
-        'log'             => false,
+        'host' => null,
+        'port' => null,
+        'path' => null,
+        'url' => null,
+        'proxy' => null,
+        'transport' => null,
+        'persistent' => true,
+        'timeout' => null,
+        'connections' => array(), // host, port, path, timeout, transport, compression, persistent, timeout, config -> (curl, headers, url)
+        'roundRobin' => false,
+        'log' => false,
         'retryOnConflict' => 0,
+        'bigintConversion' => false,
+        'username' => null,
+        'password' => null,
     );
 
     /**
-     * @var \Elastica\Connection[] List of connections
+     * @var callback
      */
-    protected $_connections = array();
+    protected $_callback;
 
     /**
-     * @var callback
+     * @var Connection\ConnectionPool
      */
-    protected $_callback = null;
+    protected $_connectionPool;
 
     /**
      * @var \Elastica\Request
@@ -66,48 +66,68 @@ class Client
     /**
      * @var LoggerInterface
      */
-    protected $_logger = null;
+    protected $_logger;
 
     /**
-     * Creates a new Elastica client
+     * Creates a new Elastica client.
      *
-     * @param array    $config   OPTIONAL Additional config options
+     * @param array $config OPTIONAL Additional config options
      * @param callback $callback OPTIONAL Callback function which can be used to be notified about errors (for example connection down)
+     * @param LoggerInterface $logger
      */
-    public function __construct(array $config = array(), $callback = null)
+    public function __construct(array $config = array(), $callback = null, LoggerInterface $logger = null)
     {
-        $this->setConfig($config);
         $this->_callback = $callback;
+
+        if (!$logger && isset($config['log']) && $config['log']) {
+            $logger = new Log($config['log']);
+        }
+        $this->_logger = $logger ?: new NullLogger();
+
+        $this->setConfig($config);
         $this->_initConnections();
     }
 
     /**
-     * Inits the client connections
+     * Inits the client connections.
      */
     protected function _initConnections()
     {
-        $connections = $this->getConfig('connections');
+        $connections = array();
 
-        foreach ($connections as $connection) {
-            $this->_connections[] = Connection::create($this->_prepareConnectionParams($connection));
+        foreach ($this->getConfig('connections') as $connection) {
+            $connections[] = Connection::create($this->_prepareConnectionParams($connection));
         }
 
         if (isset($this->_config['servers'])) {
             foreach ($this->getConfig('servers') as $server) {
-                $this->_connections[] = Connection::create($this->_prepareConnectionParams($server));
+                $connections[] = Connection::create($this->_prepareConnectionParams($server));
             }
         }
 
         // If no connections set, create default connection
-        if (empty($this->_connections)) {
-            $this->_connections[] = Connection::create($this->_prepareConnectionParams($this->getConfig()));
+        if (empty($connections)) {
+            $connections[] = Connection::create($this->_prepareConnectionParams($this->getConfig()));
+        }
+
+        if (!isset($this->_config['connectionStrategy'])) {
+            if ($this->getConfig('roundRobin') === true) {
+                $this->setConfigValue('connectionStrategy', 'RoundRobin');
+            } else {
+                $this->setConfigValue('connectionStrategy', 'Simple');
+            }
         }
+
+        $strategy = Connection\Strategy\StrategyFactory::create($this->getConfig('connectionStrategy'));
+
+        $this->_connectionPool = new Connection\ConnectionPool($connections, $strategy, $this->_callback);
     }
 
     /**
      * Creates a Connection params array from a Client or server config array.
      *
      * @param array $config
+     *
      * @return array
      */
     protected function _prepareConnectionParams(array $config)
@@ -115,7 +135,7 @@ protected function _prepareConnectionParams(array $config)
         $params = array();
         $params['config'] = array();
         foreach ($config as $key => $value) {
-            if (in_array($key, array('curl', 'headers', 'url'))) {
+            if (in_array($key, array('bigintConversion', 'curl', 'headers', 'url'))) {
                 $params['config'][$key] = $value;
             } else {
                 $params[$key] = $value;
@@ -126,10 +146,11 @@ protected function _prepareConnectionParams(array $config)
     }
 
     /**
-     * Sets specific config values (updates and keeps default values)
+     * Sets specific config values (updates and keeps default values).
+     *
+     * @param array $config Params
      *
-     * @param  array           $config Params
-     * @return \Elastica\Client
+     * @return $this
      */
     public function setConfig(array $config)
     {
@@ -142,11 +163,13 @@ public function setConfig(array $config)
 
     /**
      * Returns a specific config key or the whole
-     * config array if not set
+     * config array if not set.
+     *
+     * @param string $key Config key
      *
-     * @param  string                              $key Config key
      * @throws \Elastica\Exception\InvalidException
-     * @return array|string                        Config value
+     *
+     * @return array|string Config value
      */
     public function getConfig($key = '')
     {
@@ -155,18 +178,19 @@ public function getConfig($key = '')
         }
 
         if (!array_key_exists($key, $this->_config)) {
-            throw new InvalidException('Config key is not set: ' . $key);
+            throw new InvalidException('Config key is not set: '.$key);
         }
 
         return $this->_config[$key];
     }
 
     /**
-     * Sets / overwrites a specific config value
+     * Sets / overwrites a specific config value.
+     *
+     * @param string $key   Key to set
+     * @param mixed  $value Value
      *
-     * @param  string          $key   Key to set
-     * @param  mixed           $value Value
-     * @return \Elastica\Client Client object
+     * @return $this
      */
     public function setConfigValue($key, $value)
     {
@@ -174,8 +198,9 @@ public function setConfigValue($key, $value)
     }
 
     /**
-     * @param array|string $keys config key or path of config keys
-     * @param mixed $default default value will be returned if key was not found
+     * @param array|string $keys    config key or path of config keys
+     * @param mixed        $default default value will be returned if key was not found
+     *
      * @return mixed
      */
     public function getConfigValue($keys, $default = null)
@@ -188,13 +213,15 @@ public function getConfigValue($keys, $default = null)
                 return $default;
             }
         }
+
         return $value;
     }
 
     /**
-     * Returns the index for the given connection
+     * Returns the index for the given connection.
+     *
+     * @param string $name Index name to create connection to
      *
-     * @param  string         $name Index name to create connection to
      * @return \Elastica\Index Index for the given name
      */
     public function getIndex($name)
@@ -203,11 +230,14 @@ public function getIndex($name)
     }
 
     /**
-     * Adds a HTTP Header
+     * Adds a HTTP Header.
+     *
+     * @param string $header      The HTTP Header
+     * @param string $headerValue The HTTP Header Value
      *
-     * @param  string                              $header      The HTTP Header
-     * @param  string                              $headerValue The HTTP Header Value
      * @throws \Elastica\Exception\InvalidException If $header or $headerValue is not a string
+     *
+     * @return $this
      */
     public function addHeader($header, $headerValue)
     {
@@ -216,13 +246,18 @@ public function addHeader($header, $headerValue)
         } else {
             throw new InvalidException('Header must be a string');
         }
+
+        return $this;
     }
 
     /**
-     * Remove a HTTP Header
+     * Remove a HTTP Header.
+     *
+     * @param string $header The HTTP Header to remove
+     *
+     * @throws \Elastica\Exception\InvalidException If $header is not a string
      *
-     * @param  string                              $header The HTTP Header to remove
-     * @throws \Elastica\Exception\InvalidException IF $header is not a string
+     * @return $this
      */
     public function removeHeader($header)
     {
@@ -233,19 +268,52 @@ public function removeHeader($header)
         } else {
             throw new InvalidException('Header must be a string');
         }
+
+        return $this;
     }
 
     /**
-     * Uses _bulk to send documents to the server
+     * Uses _bulk to send documents to the server.
      *
      * Array of \Elastica\Document as input. Index and type has to be
      * set inside the document, because for bulk settings documents,
      * documents can belong to any type and index
      *
-     * @param  array|\Elastica\Document[]           $docs Array of Elastica\Document
-     * @return \Elastica\Bulk\ResponseSet                   Response object
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
+     *
+     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     *
+     * @throws \Elastica\Exception\InvalidException If docs is empty
+     *
+     * @return \Elastica\Bulk\ResponseSet Response object
+     */
+    public function updateDocuments(array $docs)
+    {
+        if (empty($docs)) {
+            throw new InvalidException('Array has to consist of at least one element');
+        }
+
+        $bulk = new Bulk($this);
+
+        $bulk->addDocuments($docs, \Elastica\Bulk\Action::OP_TYPE_UPDATE);
+
+        return $bulk->send();
+    }
+
+    /**
+     * Uses _bulk to send documents to the server.
+     *
+     * Array of \Elastica\Document as input. Index and type has to be
+     * set inside the document, because for bulk settings documents,
+     * documents can belong to any type and index
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
+     *
+     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     *
      * @throws \Elastica\Exception\InvalidException If docs is empty
-     * @link http://www.elasticsearch.org/guide/reference/api/bulk.html
+     *
+     * @return \Elastica\Bulk\ResponseSet Response object
      */
     public function addDocuments(array $docs)
     {
@@ -261,25 +329,25 @@ public function addDocuments(array $docs)
     }
 
     /**
-     * Update document, using update script. Requires elasticsearch >= 0.19.0
+     * Update document, using update script. Requires elasticsearch >= 0.19.0.
+     *
+     * @param int                                                      $id      document id
+     * @param array|\Elastica\Script\AbstractScript|\Elastica\Document $data    raw data for request body
+     * @param string                                                   $index   index to update
+     * @param string                                                   $type    type of index to update
+     * @param array                                                    $options array of query params to use for query. For possible options check es api
      *
-     * @param  int                  $id      document id
-     * @param  array|\Elastica\Script|\Elastica\Document $data    raw data for request body
-     * @param  string               $index   index to update
-     * @param  string               $type    type of index to update
-     * @param  array                $options array of query params to use for query. For possible options check es api
      * @return \Elastica\Response
-     * @link http://www.elasticsearch.org/guide/reference/api/update.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update.html
      */
     public function updateDocument($id, $data, $index, $type, array $options = array())
     {
-        $path =  $index . '/' . $type . '/' . $id . '/_update';
+        $path = $index.'/'.$type.'/'.$id.'/_update';
 
-        if ($data instanceof Script) {
+        if ($data instanceof AbstractScript) {
             $requestData = $data->toArray();
-
         } elseif ($data instanceof Document) {
-
             $requestData = array('doc' => $data->getData());
 
             if ($data->getDocAsUpsert()) {
@@ -314,15 +382,14 @@ public function updateDocument($id, $data, $index, $type, array $options = array
         }
 
         //If an upsert document exists
-        if ($data instanceof Script || $data instanceof Document) {
-
+        if ($data instanceof AbstractScript || $data instanceof Document) {
             if ($data->hasUpsert()) {
                 $requestData['upsert'] = $data->getUpsert()->getData();
             }
         }
 
         if (!isset($options['retry_on_conflict'])) {
-            $retryOnConflict = $this->getConfig("retryOnConflict");
+            $retryOnConflict = $this->getConfig('retryOnConflict');
             $options['retry_on_conflict'] = $retryOnConflict;
         }
 
@@ -347,7 +414,7 @@ public function updateDocument($id, $data, $index, $type, array $options = array
     /**
      * @param \Elastica\Response $response
      * @param \Elastica\Document $document
-     * @param string $fields Array of field names to be populated or '_source' if whole document data should be updated
+     * @param string             $fields   Array of field names to be populated or '_source' if whole document data should be updated
      */
     protected function _populateDocumentFieldsFromResponse(Response $response, Document $document, $fields)
     {
@@ -371,11 +438,13 @@ protected function _populateDocumentFieldsFromResponse(Response $response, Docum
     }
 
     /**
-     * Bulk deletes documents
+     * Bulk deletes documents.
      *
      * @param array|\Elastica\Document[] $docs
-     * @return \Elastica\Bulk\ResponseSet
+     *
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return \Elastica\Bulk\ResponseSet
      */
     public function deleteDocuments(array $docs)
     {
@@ -390,7 +459,7 @@ public function deleteDocuments(array $docs)
     }
 
     /**
-     * Returns the status object for all indices
+     * Returns the status object for all indices.
      *
      * @return \Elastica\Status Status object
      */
@@ -400,7 +469,7 @@ public function getStatus()
     }
 
     /**
-     * Returns the current cluster
+     * Returns the current cluster.
      *
      * @return \Elastica\Cluster Cluster object
      */
@@ -410,54 +479,43 @@ public function getCluster()
     }
 
     /**
-     * @param  \Elastica\Connection $connection
-     * @return \Elastica\Client
+     * Establishes the client connections
+     */
+    public function connect()
+    {
+        return $this->_initConnections();
+    }
+
+    /**
+     * @param \Elastica\Connection $connection
+     *
+     * @return $this
      */
     public function addConnection(Connection $connection)
     {
-        $this->_connections[] = $connection;
+        $this->_connectionPool->addConnection($connection);
 
         return $this;
     }
 
     /**
      * Determines whether a valid connection is available for use.
-     * 
+     *
      * @return bool
      */
     public function hasConnection()
     {
-        foreach ($this->_connections as $connection)
-        {
-            if ($connection->isEnabled())
-            {
-                return true;
-            }
-        }
-        
-        return false;
+        return $this->_connectionPool->hasConnection();
     }
 
     /**
      * @throws \Elastica\Exception\ClientException
+     *
      * @return \Elastica\Connection
      */
     public function getConnection()
     {
-        $enabledConnection = null;
-
-        foreach ($this->_connections as $connection) {
-            if ($connection->isEnabled()) {
-                $enabledConnection = $connection;
-                break;
-            }
-        }
-
-        if (empty($enabledConnection)) {
-            throw new ClientException('No enabled connection');
-        }
-
-        return $enabledConnection;
+        return $this->_connectionPool->getConnection();
     }
 
     /**
@@ -465,31 +523,44 @@ public function getConnection()
      */
     public function getConnections()
     {
-        return $this->_connections;
+        return $this->_connectionPool->getConnections();
     }
 
     /**
-     * @param  \Elastica\Connection[] $connections
-     * @return \Elastica\Client
+     * @return \Elastica\Connection\Strategy\StrategyInterface
+     */
+    public function getConnectionStrategy()
+    {
+        return $this->_connectionPool->getStrategy();
+    }
+
+    /**
+     * @param array|\Elastica\Connection[] $connections
+     *
+     * @return $this
      */
     public function setConnections(array $connections)
     {
-        $this->_connections = $connections;
+        $this->_connectionPool->setConnections($connections);
 
         return $this;
     }
 
     /**
-     * Deletes documents with the given ids, index, type from the index
+     * Deletes documents with the given ids, index, type from the index.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
+     *
+     * @param array                  $ids     Document ids
+     * @param string|\Elastica\Index $index   Index name
+     * @param string|\Elastica\Type  $type    Type of documents
+     * @param string|bool            $routing Optional routing key for all ids
      *
-     * @param  array                               $ids   Document ids
-     * @param  string|\Elastica\Index               $index Index name
-     * @param  string|\Elastica\Type                $type  Type of documents
      * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Bulk\ResponseSet                   Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/bulk.html
+     *
+     * @return \Elastica\Bulk\ResponseSet Response  object
      */
-    public function deleteIds(array $ids, $index, $type)
+    public function deleteIds(array $ids, $index, $type, $routing = false)
     {
         if (empty($ids)) {
             throw new InvalidException('Array has to consist of at least one id');
@@ -503,6 +574,10 @@ public function deleteIds(array $ids, $index, $type)
             $action = new Action(Action::OP_TYPE_DELETE);
             $action->setId($id);
 
+            if (!empty($routing)) {
+                $action->setRouting($routing);
+            }
+
             $bulk->addAction($action);
         }
 
@@ -510,7 +585,7 @@ public function deleteIds(array $ids, $index, $type)
     }
 
     /**
-     * Bulk operation
+     * Bulk operation.
      *
      * Every entry in the params array has to exactly on array
      * of the bulk operation. An example param array would be:
@@ -521,11 +596,14 @@ public function deleteIds(array $ids, $index, $type)
      *         array('delete' => array('_index' => 'test', '_type' => 'user', '_id' => '2'))
      * );
      *
-     * @param  array                                    $params Parameter array
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
+     *
+     * @param array $params Parameter array
+     *
      * @throws \Elastica\Exception\ResponseException
      * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Bulk\ResponseSet                        Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/bulk.html
+     *
+     * @return \Elastica\Bulk\ResponseSet Response object
      */
     public function bulk(array $params)
     {
@@ -541,88 +619,107 @@ public function bulk(array $params)
     }
 
     /**
-     * Makes calls to the elasticsearch server based on this index
+     * Makes calls to the elasticsearch server based on this index.
      *
      * It's possible to make any REST query directly over this method
      *
-     * @param  string            $path   Path to call
-     * @param  string            $method Rest method to use (GET, POST, DELETE, PUT)
-     * @param  array             $data   OPTIONAL Arguments as array
-     * @param  array             $query  OPTIONAL Query params
+     * @param string $path   Path to call
+     * @param string $method Rest method to use (GET, POST, DELETE, PUT)
+     * @param array  $data   OPTIONAL Arguments as array
+     * @param array  $query  OPTIONAL Query params
+     *
      * @throws Exception\ConnectionException|\Exception
-     * @return \Elastica\Response Response object
+     *
+     * @return Response Response object
      */
     public function request($path, $method = Request::GET, $data = array(), array $query = array())
     {
         $connection = $this->getConnection();
-        try {
-            $request = new Request($path, $method, $data, $query, $connection);
-
-            $this->_log($request);
-
-            $response = $request->send();
-
-            $this->_lastRequest = $request;
-            $this->_lastResponse = $response;
-
-            return $response;
+        $request = $this->_lastRequest = new Request($path, $method, $data, $query, $connection);
+        $this->_lastResponse = null;
 
+        try {
+            $response = $this->_lastResponse = $request->send();
         } catch (ConnectionException $e) {
-            $connection->setEnabled(false);
+            $this->_connectionPool->onFail($connection, $e, $this);
 
-            // Calls callback with connection as param to make it possible to persist invalid connections
-            if ($this->_callback) {
-                call_user_func($this->_callback, $connection, $e, $this);
-            }
+            $this->_log($e);
 
             // In case there is no valid connection left, throw exception which caused the disabling of the connection.
-            if (!$this->hasConnection())
-            {
+            if (!$this->hasConnection()) {
                 throw $e;
             }
-            
+
             return $this->request($path, $method, $data, $query);
         }
+
+        $this->_log($request);
+
+        return $response;
+    }
+
+    /**
+     * logging.
+     *
+     * @deprecated Overwriting Client->_log is deprecated. Handle logging functionality by using a custom LoggerInterface.
+     *
+     * @param mixed $context
+     */
+    protected function _log($context)
+    {
+        if ($context instanceof ConnectionException) {
+            $this->_logger->error('Elastica Request Failure', [
+                'exception' => $context,
+                'request' => $context->getRequest()->toArray(),
+                'retry' => $this->hasConnection()
+            ]);
+
+            return;
+        }
+
+        if ($context instanceof Request) {
+            $this->_logger->debug('Elastica Request', [
+                'request' => $context->toArray(),
+                'response' => $this->_lastResponse ? $this->_lastResponse->getData() : null,
+                'responseStatus' => $this->_lastResponse ? $this->_lastResponse->getStatus() : null
+            ]);
+
+            return;
+        }
+
+        $this->_logger->debug('Elastica Request', [
+            'message' => $context
+        ]);
     }
 
     /**
-     * Optimizes all search indices
+     * Optimizes all search indices.
+     *
+     * @param array $args OPTIONAL Optional arguments
      *
-     * @param  array             $args OPTIONAL Optional arguments
      * @return \Elastica\Response Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-optimize.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-optimize.html
      */
     public function optimizeAll($args = array())
     {
-        return $this->request('_optimize', Request::POST, $args);
+        return $this->request('_optimize', Request::POST, array(), $args);
     }
 
     /**
-     * logging
+     * Refreshes all search indices.
      *
-     * @param string|\Elastica\Request $context
-     * @throws Exception\RuntimeException
+     * @return \Elastica\Response Response object
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-refresh.html
      */
-    protected function _log($context)
+    public function refreshAll()
     {
-        $log = $this->getConfig('log');
-        if ($log && !class_exists('Psr\Log\AbstractLogger')) {
-            throw new RuntimeException('Class Psr\Log\AbstractLogger not found');
-        } elseif (!$this->_logger && $log) {
-            $this->setLogger(new Log($this->getConfig('log')));
-        }
-        if ($this->_logger) {
-            if ($context instanceof Request) {
-                $data = $context->toArray();
-            } else {
-                $data = array('message' => $context);
-            }
-            $this->_logger->info('logging Request', $data);
-        }
+        return $this->request('_refresh', Request::POST);
     }
 
     /**
-     * @return \Elastica\Request
+     * @return Request
      */
     public function getLastRequest()
     {
@@ -630,7 +727,7 @@ public function getLastRequest()
     }
 
     /**
-     * @return \Elastica\Response
+     * @return Response
      */
     public function getLastResponse()
     {
@@ -638,9 +735,10 @@ public function getLastResponse()
     }
 
     /**
-     * set Logger
+     * Replace the existing logger.
      *
      * @param LoggerInterface $logger
+     *
      * @return $this
      */
     public function setLogger(LoggerInterface $logger)
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster.php
index ac5acf7..6c2bd19 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster.php
@@ -1,22 +1,22 @@
 <?php
 
 namespace Elastica;
+
 use Elastica\Cluster\Health;
 use Elastica\Cluster\Settings;
 use Elastica\Exception\NotImplementedException;
 
 /**
- * Cluster informations for elasticsearch
+ * Cluster information for elasticsearch.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/api/
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster.html
  */
 class Cluster
 {
     /**
-     * Client
+     * Client.
      *
      * @var \Elastica\Client Client object
      */
@@ -37,7 +37,7 @@ class Cluster
     protected $_data;
 
     /**
-     * Creates a cluster object
+     * Creates a cluster object.
      *
      * @param \Elastica\Client $client Connection client object
      */
@@ -48,7 +48,7 @@ public function __construct(Client $client)
     }
 
     /**
-     * Refreshes all cluster information (state)
+     * Refreshes all cluster information (state).
      */
     public function refresh()
     {
@@ -58,7 +58,7 @@ public function refresh()
     }
 
     /**
-     * Returns the response object
+     * Returns the response object.
      *
      * @return \Elastica\Response Response object
      */
@@ -68,7 +68,7 @@ public function getResponse()
     }
 
     /**
-     * Return list of index names
+     * Return list of index names.
      *
      * @return array List of index names
      */
@@ -85,10 +85,11 @@ public function getIndexNames()
     }
 
     /**
-     * Returns the full state of the cluster
+     * Returns the full state of the cluster.
      *
      * @return array State array
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-cluster-state.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-state.html
      */
     public function getState()
     {
@@ -96,34 +97,40 @@ public function getState()
     }
 
     /**
-     * Returns a list of existing node names
+     * Returns a list of existing node names.
      *
      * @return array List of node names
      */
     public function getNodeNames()
     {
         $data = $this->getState();
+        $nodeNames = array();
+        foreach ($data['nodes'] as $node) {
+            $nodeNames[] = $node['name'];
+        }
 
-        return array_keys($data['routing_nodes']['nodes']);
+        return $nodeNames;
     }
 
     /**
-     * Returns all nodes of the cluster
+     * Returns all nodes of the cluster.
      *
      * @return \Elastica\Node[]
      */
     public function getNodes()
     {
         $nodes = array();
-        foreach ($this->getNodeNames() as $name) {
-            $nodes[] = new Node($name, $this->getClient());
+        $data = $this->getState();
+
+        foreach ($data['nodes'] as $id => $name) {
+            $nodes[] = new Node($id, $this->getClient());
         }
 
         return $nodes;
     }
 
     /**
-     * Returns the client object
+     * Returns the client object.
      *
      * @return \Elastica\Client Client object
      */
@@ -133,11 +140,13 @@ public function getClient()
     }
 
     /**
-     * Returns the cluster information (not implemented yet)
+     * Returns the cluster information (not implemented yet).
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-info.html
+     *
+     * @param array $args Additional arguments
      *
-     * @param  array                                      $args Additional arguments
      * @throws \Elastica\Exception\NotImplementedException
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-cluster-nodes-info.html
      */
     public function getInfo(array $args)
     {
@@ -145,10 +154,11 @@ public function getInfo(array $args)
     }
 
     /**
-     * Return Cluster health
+     * Return Cluster health.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html
      *
      * @return \Elastica\Cluster\Health
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-cluster-health.html
      */
     public function getHealth()
     {
@@ -156,7 +166,7 @@ public function getHealth()
     }
 
     /**
-     * Return Cluster settings
+     * Return Cluster settings.
      *
      * @return \Elastica\Cluster\Settings
      */
@@ -166,15 +176,17 @@ public function getSettings()
     }
 
     /**
-     * Shuts down the complete cluster
+     * Shuts down the complete cluster.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-shutdown.html
+     *
+     * @param string $delay OPTIONAL Seconds to shutdown cluster after (default = 1s)
      *
-     * @param  string            $delay OPTIONAL Seconds to shutdown cluster after (default = 1s)
      * @return \Elastica\Response
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-cluster-nodes-shutdown.html
      */
     public function shutdown($delay = '1s')
     {
-        $path = '_shutdown?delay=' . $delay;
+        $path = '_shutdown?delay='.$delay;
 
         return $this->_client->request($path, Request::POST);
     }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health.php
index 18c77cf..36c6c1d 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Elastica\Cluster;
+
 use Elastica\Client;
 use Elastica\Cluster\Health\Index;
 use Elastica\Request;
@@ -8,23 +9,19 @@
 /**
  * Elastic cluster health.
  *
- * @package Elastica
  * @author Ray Ward <ray.ward@bigcommerce.com>
- * @link http://www.elasticsearch.org/guide/reference/api/admin-cluster-health.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html
  */
 class Health
 {
     /**
-     * Elastica client.
-     *
-     * @var \Elastica\Client Client object
+     * @var \Elastica\Client Client object.
      */
     protected $_client = null;
 
     /**
-     * The cluster health data.
-     *
-     * @var array
+     * @var array The cluster health data.
      */
     protected $_data = null;
 
@@ -63,7 +60,7 @@ public function getData()
     /**
      * Refreshes the health data for the cluster.
      *
-     * @return \Elastica\Cluster\Health
+     * @return $this
      */
     public function refresh()
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health/Index.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health/Index.php
index c39e94c..4741154 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health/Index.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health/Index.php
@@ -5,23 +5,19 @@
 /**
  * Wraps status information for an index.
  *
- * @package Elastica
  * @author Ray Ward <ray.ward@bigcommerce.com>
- * @link http://www.elasticsearch.org/guide/reference/api/admin-cluster-health.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html
  */
 class Index
 {
     /**
-     * The name of the index.
-     *
-     * @var string
+     * @var string The name of the index.
      */
     protected $_name;
 
     /**
-     * The index health data.
-     *
-     * @var array
+     * @var array The index health data.
      */
     protected $_data;
 
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health/Shard.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health/Shard.php
index a5da08a..7eb8d38 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health/Shard.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Health/Shard.php
@@ -5,23 +5,19 @@
 /**
  * Wraps status information for a shard.
  *
- * @package Elastica
  * @author Ray Ward <ray.ward@bigcommerce.com>
- * @link http://www.elasticsearch.org/guide/reference/api/admin-cluster-health.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html
  */
 class Shard
 {
     /**
-     * The shard index/number.
-     *
-     * @var int
+     * @var int The shard index/number.
      */
     protected $_shardNumber;
 
     /**
-     * The shard health data.
-     *
-     * @var array
+     * @var array The shard health data.
      */
     protected $_data;
 
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Settings.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Settings.php
index b7930a1..aaea03c 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Settings.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Cluster/Settings.php
@@ -1,28 +1,26 @@
 <?php
 
 namespace Elastica\Cluster;
+
 use Elastica\Client;
 use Elastica\Request;
 
 /**
- * Cluster settings
+ * Cluster settings.
  *
- * @category Xodoa
- * @package  Elastica
  * @author   Nicolas Ruflin <spam@ruflin.com>
- * @link     http://www.elasticsearch.org/guide/reference/api/admin-cluster-update-settings.html
+ *
+ * @link     https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-update-settings.html
  */
 class Settings
 {
     /**
-     * Client
-     *
      * @var \Elastica\Client Client object
      */
     protected $_client = null;
 
     /**
-     * Creates a cluster object
+     * Creates a cluster object.
      *
      * @param \Elastica\Client $client Connection client object
      */
@@ -32,7 +30,7 @@ public function __construct(Client $client)
     }
 
     /**
-     * Returns settings data
+     * Returns settings data.
      *
      * @return array Settings data (persistent and transient)
      */
@@ -42,11 +40,12 @@ public function get()
     }
 
     /**
-     * Returns the current persistent settings of the cluster
+     * Returns the current persistent settings of the cluster.
      *
      * If param is set, only specified setting is return.
      *
-     * @param  string            $setting OPTIONAL Setting name to return
+     * @param string $setting OPTIONAL Setting name to return
+     *
      * @return array|string|null Settings data
      */
     public function getPersistent($setting = '')
@@ -55,10 +54,10 @@ public function getPersistent($setting = '')
         $settings = $data['persistent'];
 
         if (!empty($setting)) {
-            if (isset($settings[ $setting])) {
+            if (isset($settings[$setting])) {
                 return $settings[$setting];
             } else {
-                return null;
+                return;
             }
         }
 
@@ -66,11 +65,12 @@ public function getPersistent($setting = '')
     }
 
     /**
-     * Returns the current transient settings of the cluster
+     * Returns the current transient settings of the cluster.
      *
      * If param is set, only specified setting is return.
      *
-     * @param  string            $setting OPTIONAL Setting name to return
+     * @param string $setting OPTIONAL Setting name to return
+     *
      * @return array|string|null Settings data
      */
     public function getTransient($setting = '')
@@ -79,10 +79,24 @@ public function getTransient($setting = '')
         $settings = $data['transient'];
 
         if (!empty($setting)) {
-            if (isset($settings[ $setting])) {
+            if (isset($settings[$setting])) {
                 return $settings[$setting];
             } else {
-                return null;
+                if (strpos($setting, '.') !== false) {
+                    // convert dot notation to nested arrays
+                    $keys = explode('.', $setting);
+                    foreach ($keys as $key) {
+                        if (isset($settings[$key])) {
+                            $settings = $settings[$key];
+                        } else {
+                            return;
+                        }
+                    }
+
+                    return $settings;
+                }
+
+                return;
             }
         }
 
@@ -90,10 +104,11 @@ public function getTransient($setting = '')
     }
 
     /**
-     * Sets persistent setting
+     * Sets persistent setting.
+     *
+     * @param string $key
+     * @param string $value
      *
-     * @param  string            $key
-     * @param  string            $value
      * @return \Elastica\Response
      */
     public function setPersistent($key, $value)
@@ -101,17 +116,18 @@ public function setPersistent($key, $value)
         return $this->set(
             array(
                 'persistent' => array(
-                    $key => $value
-                )
+                    $key => $value,
+                ),
             )
         );
     }
 
     /**
-     * Sets transient settings
+     * Sets transient settings.
+     *
+     * @param string $key
+     * @param string $value
      *
-     * @param  string            $key
-     * @param  string            $value
      * @return \Elastica\Response
      */
     public function setTransient($key, $value)
@@ -119,19 +135,20 @@ public function setTransient($key, $value)
         return $this->set(
             array(
                 'transient' => array(
-                    $key => $value
-                )
+                    $key => $value,
+                ),
             )
         );
     }
 
     /**
-     * Sets the cluster to read only
+     * Sets the cluster to read only.
      *
      * Second param can be used to set it persistent
      *
-     * @param  bool              $readOnly
-     * @param  bool              $persistent
+     * @param bool $readOnly
+     * @param bool $persistent
+     *
      * @return \Elastica\Response $response
      */
     public function setReadOnly($readOnly = true, $persistent = false)
@@ -148,9 +165,10 @@ public function setReadOnly($readOnly = true, $persistent = false)
     }
 
     /**
-     * Set settings for cluster
+     * Set settings for cluster.
+     *
+     * @param array $settings Raw settings (including persistent or transient)
      *
-     * @param  array             $settings Raw settings (including persistent or transient)
      * @return \Elastica\Response
      */
     public function set(array $settings)
@@ -159,7 +177,7 @@ public function set(array $settings)
     }
 
     /**
-     * Get the client
+     * Get the client.
      *
      * @return \Elastica\Client
      */
@@ -169,10 +187,11 @@ public function getClient()
     }
 
     /**
-     * Sends settings request
+     * Sends settings request.
+     *
+     * @param array  $data   OPTIONAL Data array
+     * @param string $method OPTIONAL Transfer method (default = \Elastica\Request::GET)
      *
-     * @param  array             $data   OPTIONAL Data array
-     * @param  string            $method OPTIONAL Transfer method (default = \Elastica\Request::GET)
      * @return \Elastica\Response Response object
      */
     public function request(array $data = array(), $method = Request::GET)
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection.php
index b9d910c..fbcc050 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection.php
@@ -1,35 +1,41 @@
 <?php
 
 namespace Elastica;
+
 use Elastica\Exception\InvalidException;
 use Elastica\Transport\AbstractTransport;
 
 /**
- * Elastica connection instance to an elasticasearch node
+ * Elastica connection instance to an elasticasearch node.
  *
- * @category Xodoa
- * @package  Elastica
  * @author   Nicolas Ruflin <spam@ruflin.com>
  */
 class Connection extends Param
 {
     /**
-     * Default elastic search port
+     * Default elastic search port.
      */
     const DEFAULT_PORT = 9200;
 
     /**
-     * Default host
+     * Default host.
      */
     const DEFAULT_HOST = 'localhost';
 
     /**
-     * Default transport
+     * Default transport.
      *
      * @var string
      */
     const DEFAULT_TRANSPORT = 'Http';
 
+    /**
+     * Default compression.
+     *
+     * @var string
+     */
+    const DEFAULT_COMPRESSION = false;
+
     /**
      * Number of seconds after a timeout occurs for every request
      * If using indexing of file large value necessary.
@@ -37,7 +43,14 @@ class Connection extends Param
     const TIMEOUT = 300;
 
     /**
-     * Creates a new connection object. A connection is enabled by default
+     * Number of seconds after a connection timeout occurs for every request during the connection phase.
+     *
+     * @see Connection::setConnectTimeout();
+     */
+    const CONNECT_TIMEOUT = 0;
+
+    /**
+     * Creates a new connection object. A connection is enabled by default.
      *
      * @param array $params OPTIONAL Connection params: host, port, transport, timeout. All are optional
      */
@@ -57,12 +70,13 @@ public function __construct(array $params = array())
      */
     public function getPort()
     {
-        return $this->hasParam('port')?$this->getParam('port'):self::DEFAULT_PORT;
+        return $this->hasParam('port') ? $this->getParam('port') : self::DEFAULT_PORT;
     }
 
     /**
-     * @param  int                 $port
-     * @return \Elastica\Connection
+     * @param int $port
+     *
+     * @return $this
      */
     public function setPort($port)
     {
@@ -74,12 +88,13 @@ public function setPort($port)
      */
     public function getHost()
     {
-        return $this->hasParam('host')?$this->getParam('host'):self::DEFAULT_HOST;
+        return $this->hasParam('host') ? $this->getParam('host') : self::DEFAULT_HOST;
     }
 
     /**
-     * @param  string              $host
-     * @return \Elastica\Connection
+     * @param string $host
+     *
+     * @return $this
      */
     public function setHost($host)
     {
@@ -91,7 +106,7 @@ public function setHost($host)
      */
     public function getProxy()
     {
-        return $this->hasParam('proxy')?$this->getParam('proxy'):null;
+        return $this->hasParam('proxy') ? $this->getParam('proxy') : null;
     }
 
     /**
@@ -99,8 +114,10 @@ public function getProxy()
      * empty string to disable proxy and proxy string to set actual http proxy.
      *
      * @see http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTPROXY
-     * @param  string|null              $proxy
-     * @return \Elastica\Connection
+     *
+     * @param string|null $proxy
+     *
+     * @return $this
      */
     public function setProxy($proxy)
     {
@@ -112,29 +129,49 @@ public function setProxy($proxy)
      */
     public function getTransport()
     {
-        return $this->hasParam('transport')?$this->getParam('transport'):self::DEFAULT_TRANSPORT;
+        return $this->hasParam('transport') ? $this->getParam('transport') : self::DEFAULT_TRANSPORT;
     }
 
     /**
-     * @param  string|array        $transport
-     * @return \Elastica\Connection
+     * @param string|array $transport
+     *
+     * @return $this
      */
     public function setTransport($transport)
     {
         return $this->setParam('transport', $transport);
     }
 
+    /**
+     * @return bool
+     */
+    public function hasCompression()
+    {
+        return (bool) $this->hasParam('compression') ? $this->getParam('compression') : self::DEFAULT_COMPRESSION;
+    }
+
+    /**
+     * @param bool $compression
+     *
+     * @return $this
+     */
+    public function setCompression($compression = null)
+    {
+        return $this->setParam('compression', $compression);
+    }
+
     /**
      * @return string
      */
     public function getPath()
     {
-        return $this->hasParam('path')?$this->getParam('path'):'';
+        return $this->hasParam('path') ? $this->getParam('path') : '';
     }
 
     /**
-     * @param  string              $path
-     * @return \Elastica\Connection
+     * @param string $path
+     *
+     * @return $this
      */
     public function setPath($path)
     {
@@ -142,8 +179,9 @@ public function setPath($path)
     }
 
     /**
-     * @param  int                 $timeout Timeout in seconds
-     * @return \Elastica\Connection
+     * @param int $timeout Timeout in seconds
+     *
+     * @return $this
      */
     public function setTimeout($timeout)
     {
@@ -155,14 +193,40 @@ public function setTimeout($timeout)
      */
     public function getTimeout()
     {
-        return (int) $this->hasParam('timeout')?$this->getParam('timeout'):self::TIMEOUT;
+        return (int) $this->hasParam('timeout') ? $this->getParam('timeout') : self::TIMEOUT;
     }
 
     /**
-     * Enables a connection
+     * Number of seconds after a connection timeout occurs for every request during the connection phase.
+     * Use a small value if you need a fast fail in case of dead, unresponsive or unreachable servers (~5 sec).
+     *
+     * Set to zero to switch to the default built-in connection timeout (300 seconds in curl).
+     *
+     * @see http://curl.haxx.se/libcurl/c/CURLOPT_CONNECTTIMEOUT.html
+     *
+     * @param int $timeout Connect timeout in seconds
      *
-     * @param  bool                $enabled OPTIONAL (default = true)
-     * @return \Elastica\Connection
+     * @return $this
+     */
+    public function setConnectTimeout($timeout)
+    {
+        return $this->setParam('connectTimeout', $timeout);
+    }
+
+    /**
+     * @return int Connection timeout in seconds
+     */
+    public function getConnectTimeout()
+    {
+        return (int) $this->hasParam('connectTimeout') ? $this->getParam('connectTimeout') : self::CONNECT_TIMEOUT;
+    }
+
+    /**
+     * Enables a connection.
+     *
+     * @param bool $enabled OPTIONAL (default = true)
+     *
+     * @return $this
      */
     public function setEnabled($enabled = true)
     {
@@ -178,10 +242,11 @@ public function isEnabled()
     }
 
     /**
-     * Returns an instance of the transport type
+     * Returns an instance of the transport type.
+     *
+     * @throws \Elastica\Exception\InvalidException If invalid transport type
      *
      * @return \Elastica\Transport\AbstractTransport Transport object
-     * @throws \Elastica\Exception\InvalidException  If invalid transport type
      */
     public function getTransportObject()
     {
@@ -195,12 +260,13 @@ public function getTransportObject()
      */
     public function isPersistent()
     {
-        return (bool) $this->hasParam('persistent')?$this->getParam('persistent'):true;
+        return (bool) $this->hasParam('persistent') ? $this->getParam('persistent') : true;
     }
 
     /**
-     * @param  array               $config
-     * @return \Elastica\Connection
+     * @param array $config
+     *
+     * @return $this
      */
     public function setConfig(array $config)
     {
@@ -208,9 +274,10 @@ public function setConfig(array $config)
     }
 
     /**
-     * @param  string              $key
-     * @param  mixed               $value
-     * @return \Elastica\Connection
+     * @param string $key
+     * @param mixed  $value
+     *
+     * @return $this
      */
     public function addConfig($key, $value)
     {
@@ -220,7 +287,8 @@ public function addConfig($key, $value)
     }
 
     /**
-     * @param  string $key
+     * @param string $key
+     *
      * @return bool
      */
     public function hasConfig($key)
@@ -232,11 +300,13 @@ public function hasConfig($key)
 
     /**
      * Returns a specific config key or the whole
-     * config array if not set
+     * config array if not set.
+     *
+     * @param string $key Config key
      *
-     * @param  string                              $key Config key
      * @throws \Elastica\Exception\InvalidException
-     * @return array|string                        Config value
+     *
+     * @return array|string Config value
      */
     public function getConfig($key = '')
     {
@@ -246,29 +316,47 @@ public function getConfig($key = '')
         }
 
         if (!array_key_exists($key, $config)) {
-            throw new InvalidException('Config key is not set: ' . $key);
+            throw new InvalidException('Config key is not set: '.$key);
         }
 
         return $config[$key];
     }
 
     /**
-     * @param  \Elastica\Connection|array $params Params to create a connection
+     * @param \Elastica\Connection|array $params Params to create a connection
+     *
      * @throws Exception\InvalidException
-     * @return \Elastica\Connection
+     *
+     * @return self
      */
     public static function create($params = array())
     {
         $connection = null;
 
-        if ($params instanceof Connection) {
+        if ($params instanceof self) {
             $connection = $params;
         } elseif (is_array($params)) {
-            $connection = new Connection($params);
+            $connection = new self($params);
         } else {
             throw new InvalidException('Invalid data type');
         }
 
         return $connection;
     }
+
+    /**
+     * @return string User
+     */
+    public function getUsername()
+    {
+        return $this->hasParam('username') ? $this->getParam('username') : null;
+    }
+
+    /**
+     * @return string Password
+     */
+    public function getPassword()
+    {
+        return $this->hasParam('password') ? $this->getParam('password') : null;
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/ConnectionPool.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/ConnectionPool.php
new file mode 100755
index 0000000..2c9729d
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/ConnectionPool.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Elastica\Connection;
+
+use Elastica\Client;
+use Elastica\Connection;
+use Elastica\Connection\Strategy\StrategyInterface;
+use Exception;
+
+/**
+ * Description of ConnectionPool.
+ *
+ * @author chabior
+ */
+class ConnectionPool
+{
+    /**
+     * @var array|\Elastica\Connection[] Connections array
+     */
+    protected $_connections;
+
+    /**
+     * @var \Elastica\Connection\Strategy\StrategyInterface Strategy for connection
+     */
+    protected $_strategy;
+
+    /**
+     * @var callback Function called on connection fail
+     */
+    protected $_callback;
+
+    /**
+     * @param array                                           $connections
+     * @param \Elastica\Connection\Strategy\StrategyInterface $strategy
+     * @param callback                                        $callback
+     */
+    public function __construct(array $connections, StrategyInterface $strategy, $callback = null)
+    {
+        $this->_connections = $connections;
+
+        $this->_strategy = $strategy;
+
+        $this->_callback = $callback;
+    }
+
+    /**
+     * @param \Elastica\Connection $connection
+     *
+     * @return $this
+     */
+    public function addConnection(Connection $connection)
+    {
+        $this->_connections[] = $connection;
+
+        return $this;
+    }
+
+    /**
+     * @param array|\Elastica\Connection[] $connections
+     *
+     * @return $this
+     */
+    public function setConnections(array $connections)
+    {
+        $this->_connections = $connections;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasConnection()
+    {
+        foreach ($this->_connections as $connection) {
+            if ($connection->isEnabled()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    public function getConnections()
+    {
+        return $this->_connections;
+    }
+
+    /**
+     * @throws \Elastica\Exception\ClientException
+     *
+     * @return \Elastica\Connection
+     */
+    public function getConnection()
+    {
+        return $this->_strategy->getConnection($this->getConnections());
+    }
+
+    /**
+     * @param \Elastica\Connection $connection
+     * @param \Exception           $e
+     * @param Client               $client
+     */
+    public function onFail(Connection $connection, Exception $e, Client $client)
+    {
+        $connection->setEnabled(false);
+
+        if ($this->_callback) {
+            call_user_func($this->_callback, $connection, $e, $client);
+        }
+    }
+
+    /**
+     * @return \Elastica\Connection\Strategy\StrategyInterface
+     */
+    public function getStrategy()
+    {
+        return $this->_strategy;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/CallbackStrategy.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/CallbackStrategy.php
new file mode 100755
index 0000000..997c51b
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/CallbackStrategy.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Elastica\Connection\Strategy;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Description of CallbackStrategy.
+ *
+ * @author chabior
+ */
+class CallbackStrategy implements StrategyInterface
+{
+    /**
+     * @var callable
+     */
+    protected $_callback;
+
+    /**
+     * @param callable $callback
+     *
+     * @throws \Elastica\Exception\InvalidException
+     */
+    public function __construct($callback)
+    {
+        if (!self::isValid($callback)) {
+            throw new InvalidException(sprintf('Callback should be a callable, %s given!', gettype($callback)));
+        }
+
+        $this->_callback = $callback;
+    }
+
+    /**
+     * @param array|\Elastica\Connection[] $connections
+     *
+     * @return \Elastica\Connection
+     */
+    public function getConnection($connections)
+    {
+        return call_user_func_array($this->_callback, array($connections));
+    }
+
+    /**
+     * @param callable $callback
+     *
+     * @return bool
+     */
+    public static function isValid($callback)
+    {
+        return is_callable($callback);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/RoundRobin.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/RoundRobin.php
new file mode 100755
index 0000000..871c811
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/RoundRobin.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Elastica\Connection\Strategy;
+
+/**
+ * Description of RoundRobin.
+ *
+ * @author chabior
+ */
+class RoundRobin extends Simple
+{
+    /**
+     * @param array|\Elastica\Connection[] $connections
+     *
+     * @throws \Elastica\Exception\ClientException
+     *
+     * @return \Elastica\Connection
+     */
+    public function getConnection($connections)
+    {
+        shuffle($connections);
+
+        return parent::getConnection($connections);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/Simple.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/Simple.php
new file mode 100755
index 0000000..6d0b702
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/Simple.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Elastica\Connection\Strategy;
+
+use Elastica\Exception\ClientException;
+
+/**
+ * Description of SimpleStrategy.
+ *
+ * @author chabior
+ */
+class Simple implements StrategyInterface
+{
+    /**
+     * @param array|\Elastica\Connection[] $connections
+     *
+     * @throws \Elastica\Exception\ClientException
+     *
+     * @return \Elastica\Connection
+     */
+    public function getConnection($connections)
+    {
+        foreach ($connections as $connection) {
+            if ($connection->isEnabled()) {
+                return $connection;
+            }
+        }
+
+        throw new ClientException('No enabled connection');
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/StrategyFactory.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/StrategyFactory.php
new file mode 100755
index 0000000..14603df
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/StrategyFactory.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Elastica\Connection\Strategy;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Description of StrategyFactory.
+ *
+ * @author chabior
+ */
+class StrategyFactory
+{
+    /**
+     * @param mixed|callable|string|StrategyInterface $strategyName
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return \Elastica\Connection\Strategy\StrategyInterface
+     */
+    public static function create($strategyName)
+    {
+        if ($strategyName instanceof StrategyInterface) {
+            return $strategyName;
+        }
+
+        if (CallbackStrategy::isValid($strategyName)) {
+            return new CallbackStrategy($strategyName);
+        }
+
+        if (is_string($strategyName)) {
+            $requiredInterface = '\\Elastica\\Connection\\Strategy\\StrategyInterface';
+            $predefinedStrategy = '\\Elastica\\Connection\\Strategy\\'.$strategyName;
+
+            if (class_exists($predefinedStrategy) && class_implements($predefinedStrategy, $requiredInterface)) {
+                return new $predefinedStrategy();
+            }
+
+            if (class_exists($strategyName) && class_implements($strategyName, $requiredInterface)) {
+                return new $strategyName();
+            }
+        }
+
+        throw new InvalidException('Can\'t create strategy instance by given argument');
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/StrategyInterface.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/StrategyInterface.php
new file mode 100755
index 0000000..64e996e
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Connection/Strategy/StrategyInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Elastica\Connection\Strategy;
+
+/**
+ * Description of AbstractStrategy.
+ *
+ * @author chabior
+ */
+interface StrategyInterface
+{
+    /**
+     * @param array|\Elastica\Connection[] $connections
+     *
+     * @return \Elastica\Connection
+     */
+    public function getConnection($connections);
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Document.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Document.php
index 535568a..8aa61da 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Document.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Document.php
@@ -2,53 +2,46 @@
 
 namespace Elastica;
 
-use Elastica\Exception\InvalidException;
 use Elastica\Bulk\Action;
-use Elastica\Filter\Bool;
+use Elastica\Exception\DeprecatedException;
+use Elastica\Exception\InvalidException;
 use Elastica\Exception\NotImplementedException;
 
 /**
- * Single document stored in elastic search
+ * Single document stored in elastic search.
  *
- * @category Xodoa
- * @package  Elastica
  * @author   Nicolas Ruflin <spam@ruflin.com>
  */
-class Document extends Param
+class Document extends AbstractUpdateAction
 {
     const OP_TYPE_CREATE = Action::OP_TYPE_CREATE;
 
     /**
-     * Document data
+     * Document data.
      *
      * @var array Document data
      */
     protected $_data = array();
 
-    /**
-     * @var \Elastica\Document
-     */
-    protected $_upsert;
-
     /**
      * Whether to use this document to upsert if the document does not exist.
      *
-     * @var boolean
+     * @var bool
      */
     protected $_docAsUpsert = false;
 
     /**
-     * @var boolean
+     * @var bool
      */
     protected $_autoPopulate = false;
 
     /**
-     * Creates a new document
+     * Creates a new document.
      *
-     * @param int|string $id    OPTIONAL $id Id is create if empty
-     * @param array|string  $data  OPTIONAL Data array
-     * @param string     $type  OPTIONAL Type name
-     * @param string     $index OPTIONAL Index name
+     * @param int|string   $id    OPTIONAL $id Id is create if empty
+     * @param array|string $data  OPTIONAL Data array
+     * @param string       $type  OPTIONAL Type name
+     * @param string       $index OPTIONAL Index name
      */
     public function __construct($id = '', $data = array(), $type = '', $index = '')
     {
@@ -58,37 +51,9 @@ public function __construct($id = '', $data = array(), $type = '', $index = '')
         $this->setIndex($index);
     }
 
-    /**
-     * Sets the id of the document.
-     *
-     * @param  string            $id
-     * @return \Elastica\Document
-     */
-    public function setId($id)
-    {
-        return $this->setParam('_id', $id);
-    }
-
-    /**
-     * Returns document id
-     *
-     * @return string|int Document id
-     */
-    public function getId()
-    {
-        return ($this->hasParam('_id')) ? $this->getParam('_id') : null;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasId()
-    {
-        return '' !== (string) $this->getId();
-    }
-
     /**
      * @param string $key
+     *
      * @return mixed
      */
     public function __get($key)
@@ -98,7 +63,7 @@ public function __get($key)
 
     /**
      * @param string $key
-     * @param mixed $value
+     * @param mixed  $value
      */
     public function __set($key, $value)
     {
@@ -107,6 +72,7 @@ public function __set($key, $value)
 
     /**
      * @param string $key
+     *
      * @return bool
      */
     public function __isset($key)
@@ -124,22 +90,27 @@ public function __unset($key)
 
     /**
      * @param string $key
-     * @return mixed
+     *
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return mixed
      */
     public function get($key)
     {
         if (!$this->has($key)) {
             throw new InvalidException("Field {$key} does not exist");
         }
+
         return $this->_data[$key];
     }
 
     /**
      * @param string $key
-     * @param mixed $value
+     * @param mixed  $value
+     *
      * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Document
+     *
+     * @return $this
      */
     public function set($key, $value)
     {
@@ -153,6 +124,7 @@ public function set($key, $value)
 
     /**
      * @param string $key
+     *
      * @return bool
      */
     public function has($key)
@@ -162,8 +134,10 @@ public function has($key)
 
     /**
      * @param string $key
+     *
      * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Document
+     *
+     * @return $this
      */
     public function remove($key)
     {
@@ -176,20 +150,24 @@ public function remove($key)
     }
 
     /**
-     * Adds the given key/value pair to the document
+     * Adds the given key/value pair to the document.
      *
-     * @deprecated
-     * @param  string            $key   Document entry key
-     * @param  mixed             $value Document entry value
-     * @return \Elastica\Document
+     * @deprecated Will be removed in further Elastica releases. Use Elastica\Document::set instead
+     *
+     * @param string $key   Document entry key
+     * @param mixed  $value Document entry value
+     *
+     * @return $this
      */
     public function add($key, $value)
     {
+        trigger_error('Deprecated: Elastica\Document::add is deprecated and will be removed in further Elastica releases. Use Elastica\Document::set instead.', E_USER_DEPRECATED);
+
         return $this->set($key, $value);
     }
 
     /**
-     * Adds a file to the index
+     * Adds a file to the index.
      *
      * To use this feature you have to call the following command in the
      * elasticsearch directory:
@@ -199,17 +177,18 @@ public function add($key, $value)
      * This installs the tika file analysis plugin. More infos about supported formats
      * can be found here: {@link http://tika.apache.org/0.7/formats.html}
      *
-     * @param  string            $key      Key to add the file to
-     * @param  string            $filepath Path to add the file
-     * @param  string            $mimeType OPTIONAL Header mime type
-     * @return \Elastica\Document
+     * @param string $key      Key to add the file to
+     * @param string $filepath Path to add the file
+     * @param string $mimeType OPTIONAL Header mime type
+     *
+     * @return $this
      */
     public function addFile($key, $filepath, $mimeType = '')
     {
         $value = base64_encode(file_get_contents($filepath));
 
         if (!empty($mimeType)) {
-            $value = array('_content_type' => $mimeType, '_name' => $filepath, 'content' => $value,);
+            $value = array('_content_type' => $mimeType, '_name' => $filepath, '_content' => $value);
         }
 
         $this->set($key, $value);
@@ -218,11 +197,12 @@ public function addFile($key, $filepath, $mimeType = '')
     }
 
     /**
-     * Add file content
+     * Add file content.
      *
-     * @param  string            $key     Document key
-     * @param  string            $content Raw file content
-     * @return \Elastica\Document
+     * @param string $key     Document key
+     * @param string $content Raw file content
+     *
+     * @return $this
      */
     public function addFileContent($key, $content)
     {
@@ -230,19 +210,21 @@ public function addFileContent($key, $content)
     }
 
     /**
-     * Adds a geopoint to the document
+     * Adds a geopoint to the document.
      *
      * Geohashes are not yet supported
      *
      * @param string $key       Field key
      * @param float  $latitude  Latitude value
      * @param float  $longitude Longitude value
-     * @link http://www.elasticsearch.org/guide/reference/mapping/geo-point-type.html
-     * @return \Elastica\Document
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-geo-point-type.html
+     *
+     * @return $this
      */
     public function addGeoPoint($key, $latitude, $longitude)
     {
-        $value = array('lat' => $latitude, 'lon' => $longitude,);
+        $value = array('lat' => $latitude, 'lon' => $longitude);
 
         $this->set($key, $value);
 
@@ -250,10 +232,11 @@ public function addGeoPoint($key, $latitude, $longitude)
     }
 
     /**
-     * Overwrites the current document data with the given data
+     * Overwrites the current document data with the given data.
      *
-     * @param  array|string             $data Data array
-     * @return \Elastica\Document
+     * @param array|string $data Data array
+     *
+     * @return $this
      */
     public function setData($data)
     {
@@ -263,34 +246,7 @@ public function setData($data)
     }
 
     /**
-     * Sets lifetime of document
-     *
-     * @param  string            $ttl
-     * @return \Elastica\Document
-     */
-    public function setTtl($ttl)
-    {
-        return $this->setParam('_ttl', $ttl);
-    }
-
-    /**
-     * @return string
-     */
-    public function getTtl()
-    {
-        return $this->getParam('_ttl');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasTtl()
-    {
-        return $this->hasParam('_ttl');
-    }
-
-    /**
-     * Returns the document data
+     * Returns the document data.
      *
      * @return array|string Document data
      */
@@ -300,486 +256,51 @@ public function getData()
     }
 
     /**
-     * Sets the document type name
+     * @deprecated setScript() is no longer available as of 0.90.2. See http://elastica.io/migration/0.90.2/upsert.html to migrate. This method will be removed in further Elastica releases
      *
-     * @param  string            $type Type name
-     * @return \Elastica\Document Current object
-     */
-    public function setType($type)
-    {
-        if ($type instanceof Type) {
-            $this->setIndex($type->getIndex());
-            $type = $type->getName();
-        }
-        return $this->setParam('_type', $type);
-    }
-
-    /**
-     * Return document type name
-     *
-     * @return string                              Document type name
-     * @throws \Elastica\Exception\InvalidException
-     */
-    public function getType()
-    {
-        return $this->getParam('_type');
-    }
-
-    /**
-     * Sets the document index name
+     * @param \Elastica\Script\Script $data
      *
-     * @param  string            $index Index name
-     * @return \Elastica\Document Current object
-     */
-    public function setIndex($index)
-    {
-        if ($index instanceof Index) {
-            $index = $index->getName();
-        }
-        return $this->setParam('_index', $index);
-    }
-
-    /**
-     * Get the document index name
-     *
-     * @return string                              Index name
-     * @throws \Elastica\Exception\InvalidException
-     */
-    public function getIndex()
-    {
-        return $this->getParam('_index');
-    }
-
-    /**
-     * Sets the version of a document for use with optimistic concurrency control
-     *
-     * @param  int               $version Document version
-     * @return \Elastica\Document Current object
-     * @link http://www.elasticsearch.org/blog/2011/02/08/versioning.html
-     */
-    public function setVersion($version)
-    {
-        return $this->setParam('_version', (int) $version);
-    }
-
-    /**
-     * Returns document version
-     *
-     * @return string|int Document version
-     */
-    public function getVersion()
-    {
-        return $this->getParam('_version');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasVersion()
-    {
-        return $this->hasParam('_version');
-    }
-
-    /**
-     * Sets the version_type of a document
-     * Default in ES is internal, but you can set to external to use custom versioning
-     *
-     * @param  int               $versionType Document version type
-     * @return \Elastica\Document Current object
-     * @link http://www.elasticsearch.org/guide/reference/api/index_.html
-     */
-    public function setVersionType($versionType)
-    {
-        return $this->setParam('_version_type', $versionType);
-    }
-
-    /**
-     * Returns document version type
-     *
-     * @return string|int Document version type
-     */
-    public function getVersionType()
-    {
-        return $this->getParam('_version_type');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasVersionType()
-    {
-        return $this->hasParam('_version_type');
-    }
-
-    /**
-     * Sets parent document id
-     *
-     * @param  string|int        $parent Parent document id
-     * @return \Elastica\Document Current object
-     * @link http://www.elasticsearch.org/guide/reference/mapping/parent-field.html
-     */
-    public function setParent($parent)
-    {
-        return $this->setParam('_parent', $parent);
-    }
-
-    /**
-     * Returns the parent document id
-     *
-     * @return string|int Parent document id
-     */
-    public function getParent()
-    {
-        return $this->getParam('_parent');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasParent()
-    {
-        return $this->hasParam('_parent');
-    }
-
-    /**
-     * Set operation type
-     *
-     * @param  string            $opType Only accept create
-     * @return \Elastica\Document Current object
-     */
-    public function setOpType($opType)
-    {
-        return $this->setParam('_op_type', $opType);
-    }
-
-    /**
-     * Get operation type
-     * @return string
-     */
-    public function getOpType()
-    {
-        return $this->getParam('_op_type');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasOpType()
-    {
-        return $this->hasParam('_op_type');
-    }
-
-    /**
-     * Set percolate query param
-     *
-     * @param  string            $value percolator filter
-     * @return \Elastica\Document
-     */
-    public function setPercolate($value = '*')
-    {
-        return $this->setParam('_percolate', $value);
-    }
-
-    /**
-     * Get percolate parameter
-     *
-     * @return string
-     */
-    public function getPercolate()
-    {
-        return $this->getParam('_percolate');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasPercolate()
-    {
-        return $this->hasParam('_percolate');
-    }
-
-    /**
-     * Set routing query param
-     *
-     * @param  string            $value routing
-     * @return \Elastica\Document
-     */
-    public function setRouting($value)
-    {
-        return $this->setParam('_routing', $value);
-    }
-
-    /**
-     * Get routing parameter
-     *
-     * @return string
-     */
-    public function getRouting()
-    {
-        return $this->getParam('_routing');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasRouting()
-    {
-        return $this->hasParam('_routing');
-    }
-
-    /**
-     * @param array|string $fields
-     * @return \Elastica\Document
-     */
-    public function setFields($fields)
-    {
-        if (is_array($fields)) {
-            $fields = implode(',', $fields);
-        }
-        return $this->setParam('_fields', (string) $fields);
-    }
-
-    /**
-     * @return \Elastica\Document
-     */
-    public function setFieldsSource()
-    {
-        return $this->setFields('_source');
-    }
-
-    /**
-     * @return string
-     */
-    public function getFields()
-    {
-        return $this->getParam('_fields');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasFields()
-    {
-        return $this->hasParam('_fields');
-    }
-
-    /**
-     * @param int $num
-     * @return \Elastica\Document
-     */
-    public function setRetryOnConflict($num)
-    {
-        return $this->setParam('_retry_on_conflict', (int) $num);
-    }
-
-    /**
-     * @return int
-     */
-    public function getRetryOnConflict()
-    {
-        return $this->getParam('_retry_on_conflict');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasRetryOnConflict()
-    {
-        return $this->hasParam('_retry_on_conflict');
-    }
-
-    /**
-     * @param string $timestamp
-     * @return \Elastica\Document
-     */
-    public function setTimestamp($timestamp)
-    {
-        return $this->setParam('_timestamp', $timestamp);
-    }
-
-    /**
-     * @return int
-     */
-    public function getTimestamp()
-    {
-        return $this->getParam('_timestamp');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasTimestamp()
-    {
-        return $this->hasParam('_timestamp');
-    }
-
-    /**
-     * @param bool $refresh
-     * @return \Elastica\Document
-     */
-    public function setRefresh($refresh = true)
-    {
-        return $this->setParam('_refresh', (bool) $refresh);
-    }
-
-    /**
-     * @return bool
-     */
-    public function getRefresh()
-    {
-        return $this->getParam('_refresh');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasRefresh()
-    {
-        return $this->hasParam('_refresh');
-    }
-
-    /**
-     * @param string $timeout
-     * @return \Elastica\Document
-     */
-    public function setTimeout($timeout)
-    {
-        return $this->setParam('_timeout', $timeout);
-    }
-
-    /**
-     * @return bool
-     */
-    public function getTimeout()
-    {
-        return $this->getParam('_timeout');
-    }
-
-    /**
-     * @return string
-     */
-    public function hasTimeout()
-    {
-        return $this->hasParam('_timeout');
-    }
-
-    /**
-     * @param string $timeout
-     * @return \Elastica\Document
-     */
-    public function setConsistency($timeout)
-    {
-        return $this->setParam('_consistency', $timeout);
-    }
-
-    /**
-     * @return string
-     */
-    public function getConsistency()
-    {
-        return $this->getParam('_consistency');
-    }
-
-    /**
-     * @return string
-     */
-    public function hasConsistency()
-    {
-        return $this->hasParam('_consistency');
-    }
-
-    /**
-     * @param string $timeout
-     * @return \Elastica\Document
-     */
-    public function setReplication($timeout)
-    {
-        return $this->setParam('_replication', $timeout);
-    }
-
-    /**
-     * @return string
-     */
-    public function getReplication()
-    {
-        return $this->getParam('_replication');
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasReplication()
-    {
-        return $this->hasParam('_replication');
-    }
-    
-    /**
-     * @param \Elastica\Script $data
      * @throws NotImplementedException
-     * @deprecated
      */
     public function setScript($data)
     {
-       throw new NotImplementedException("setScript() is no longer avaliable as of 0.90.2. See http://elastica.io/migration/0.90.2/upsert.html to migrate");
+        throw new DeprecatedException('setScript() is no longer available as of 0.90.2. See http://elastica.io/migration/0.90.2/upsert.html to migrate');
     }
 
-    /**
-     * @param \Elastica\Document|array $data
-     * @return \Elastica\Document
-     */
-    public function setUpsert($data)
-    {
-        $document = Document::create($data);
-        $this->_upsert = $document;
-
-        return $this;
-    }
-    
     /**
      * @throws NotImplementedException
-     * @deprecated
+     *
+     * @deprecated getScript() is no longer available as of 0.90.2. See http://elastica.io/migration/0.90.2/upsert.html to migrate. This method will be removed in further Elastica releases
      */
     public function getScript()
     {
-        throw new NotImplementedException("getScript() is no longer avaliable as of 0.90.2. See http://elastica.io/migration/0.90.2/upsert.html to migrate");
+        throw new DeprecatedException('getScript() is no longer available as of 0.90.2. See http://elastica.io/migration/0.90.2/upsert.html to migrate');
     }
 
-    /**
-     * @return \Elastica\Document
-     */
-    public function getUpsert()
-    {
-        return $this->_upsert;
-    }
-    
     /**
      * @throws NotImplementedException
-     * @deprecated
+     *
+     * @deprecated hasScript() is no longer available as of 0.90.2. See http://elastica.io/migration/0.90.2/upsert.html to migrate. This method will be removed in further Elastica releases
      */
     public function hasScript()
     {
-        throw new NotImplementedException("hasScript() is no longer avaliable as of 0.90.2. See http://elastica.io/migration/0.90.2/upsert.html to migrate");
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasUpsert()
-    {
-        return null !== $this->_upsert;
+        throw new DeprecatedException('hasScript() is no longer available as of 0.90.2. See http://elastica.io/migration/0.90.2/upsert.html to migrate');
     }
 
     /**
      * @param bool $value
-     * @return \Elastica\Document
+     *
+     * @return $this
      */
     public function setDocAsUpsert($value)
     {
         $this->_docAsUpsert = (bool) $value;
+
+        return $this;
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getDocAsUpsert()
     {
@@ -788,6 +309,7 @@ public function getDocAsUpsert()
 
     /**
      * @param bool $autoPopulate
+     *
      * @return $this
      */
     public function setAutoPopulate($autoPopulate = true)
@@ -806,7 +328,8 @@ public function isAutoPopulate()
     }
 
     /**
-     * Returns the document as an array
+     * Returns the document as an array.
+     *
      * @return array
      */
     public function toArray()
@@ -818,36 +341,11 @@ public function toArray()
     }
 
     /**
-     * @param array $fields if empty array all options will be returned, field names can be either with underscored either without, i.e. _percolate, routing
-     * @param bool $withUnderscore should option keys contain underscore prefix
-     * @return array
-     */
-    public function getOptions(array $fields = array(), $withUnderscore = false)
-    {
-        if (!empty($fields)) {
-            $data = array();
-            foreach ($fields as $field) {
-                $key = '_' . ltrim($field, '_');
-                if ($this->hasParam($key) && '' !== (string) $this->getParam($key)) {
-                    $data[$key] = $this->getParam($key);
-                }
-            }
-        } else {
-            $data = $this->getParams();
-        }
-        if (!$withUnderscore) {
-            foreach ($data as $key => $value) {
-                $data[ltrim($key, '_')] = $value;
-                unset($data[$key]);
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * @param  array|\Elastica\Document        $data
+     * @param array|\Elastica\Document $data
+     *
      * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Document
+     *
+     * @return self
      */
     public static function create($data)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Bulk/Response/ActionException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Bulk/Response/ActionException.php
index 6500e04..4f7a201 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Bulk/Response/ActionException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Bulk/Response/ActionException.php
@@ -2,9 +2,8 @@
 
 namespace Elastica\Exception\Bulk\Response;
 
-use Elastica\Exception\BulkException;
-use Elastica\Bulk\Action;
 use Elastica\Bulk\Response;
+use Elastica\Exception\BulkException;
 
 class ActionException extends BulkException
 {
@@ -41,6 +40,7 @@ public function getResponse()
 
     /**
      * @param \Elastica\Bulk\Response $response
+     *
      * @return string
      */
     public function getErrorMessage(Response $response)
@@ -51,13 +51,13 @@ public function getErrorMessage(Response $response)
 
         $path = '';
         if (isset($data['_index'])) {
-            $path.= '/' . $data['_index'];
+            $path .= '/'.$data['_index'];
         }
         if (isset($data['_type'])) {
-            $path.= '/' . $data['_type'];
+            $path .= '/'.$data['_type'];
         }
         if (isset($data['_id'])) {
-            $path.= '/' . $data['_id'];
+            $path .= '/'.$data['_id'];
         }
         $message = "$opType: $path caused $error";
 
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Bulk/ResponseException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Bulk/ResponseException.php
index 9df1b3e..bfb8392 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Bulk/ResponseException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Bulk/ResponseException.php
@@ -7,16 +7,11 @@
 use Elastica\Exception\BulkException;
 
 /**
- * Bulk Response exception
- *
- * @category Xodoa
- * @package Elastica
+ * Bulk Response exception.
  */
 class ResponseException extends BulkException
 {
     /**
-     * Response
-     *
      * @var \Elastica\Bulk\ResponseSet ResponseSet object
      */
     protected $_responseSet;
@@ -27,7 +22,7 @@ class ResponseException extends BulkException
     protected $_actionExceptions = array();
 
     /**
-     * Construct Exception
+     * Construct Exception.
      *
      * @param \Elastica\Bulk\ResponseSet $responseSet
      */
@@ -35,8 +30,8 @@ public function __construct(ResponseSet $responseSet)
     {
         $this->_init($responseSet);
 
-        $message = 'Error in one or more bulk request actions:' . PHP_EOL . PHP_EOL;
-        $message.= $this->getActionExceptionsAsString();
+        $message = 'Error in one or more bulk request actions:'.PHP_EOL.PHP_EOL;
+        $message .= $this->getActionExceptionsAsString();
 
         parent::__construct($message);
     }
@@ -56,7 +51,7 @@ protected function _init(ResponseSet $responseSet)
     }
 
     /**
-     * Returns bulk response set object
+     * Returns bulk response set object.
      *
      * @return \Elastica\Bulk\ResponseSet
      */
@@ -66,7 +61,7 @@ public function getResponseSet()
     }
 
     /**
-     * Returns array of failed actions
+     * Returns array of failed actions.
      *
      * @return array Array of failed actions
      */
@@ -96,8 +91,9 @@ public function getActionExceptionsAsString()
     {
         $message = '';
         foreach ($this->getActionExceptions() as $actionException) {
-            $message.= $actionException->getMessage() . PHP_EOL;
+            $message .= $actionException->getMessage().PHP_EOL;
         }
+
         return $message;
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ClientException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ClientException.php
index 00efd67..0fe7ce0 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ClientException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ClientException.php
@@ -3,10 +3,8 @@
 namespace Elastica\Exception;
 
 /**
- * Client exception
+ * Client exception.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class ClientException extends \RuntimeException implements ExceptionInterface
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Connection/GuzzleException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Connection/GuzzleException.php
new file mode 100755
index 0000000..527cce1
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Connection/GuzzleException.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Elastica\Exception\Connection;
+
+use Elastica\Exception\ConnectionException;
+use Elastica\Request;
+use Elastica\Response;
+use GuzzleHttp\Exception\TransferException;
+
+/**
+ * Transport exception.
+ *
+ * @author Milan Magudia <milan@magudia.com>
+ */
+class GuzzleException extends ConnectionException
+{
+    /**
+     * @var TransferException
+     */
+    protected $_guzzleException;
+
+    /**
+     * @param \GuzzleHttp\Exception\TransferException $guzzleException
+     * @param \Elastica\Request                       $request
+     * @param \Elastica\Response                      $response
+     */
+    public function __construct(TransferException $guzzleException, Request $request = null, Response $response = null)
+    {
+        $this->_guzzleException = $guzzleException;
+        $message = $this->getErrorMessage($this->getGuzzleException());
+        parent::__construct($message, $request, $response);
+    }
+
+    /**
+     * @param \GuzzleHttp\Exception\TransferException $guzzleException
+     *
+     * @return string
+     */
+    public function getErrorMessage(TransferException $guzzleException)
+    {
+        return $guzzleException->getMessage();
+    }
+
+    /**
+     * @return TransferException
+     */
+    public function getGuzzleException()
+    {
+        return $this->_guzzleException;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Connection/HttpException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Connection/HttpException.php
index f05b5d4..a7c8d03 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Connection/HttpException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/Connection/HttpException.php
@@ -7,25 +7,23 @@
 use Elastica\Response;
 
 /**
- * Connection exception
+ * Connection exception.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class HttpException extends ConnectionException
 {
     /**
-     * Error code / message
+     * Error code / message.
      *
      * @var string Error code / message
      */
     protected $_error = 0;
 
     /**
-     * Construct Exception
+     * Construct Exception.
      *
-     * @param string            $error    Error
+     * @param string             $error    Error
      * @param \Elastica\Request  $request
      * @param \Elastica\Response $response
      */
@@ -39,22 +37,23 @@ public function __construct($error, Request $request = null, Response $response
 
     /**
      * Returns the error message corresponding to the error code
-     * cUrl error code reference can be found here {@link http://curl.haxx.se/libcurl/c/libcurl-errors.html}
+     * cUrl error code reference can be found here {@link http://curl.haxx.se/libcurl/c/libcurl-errors.html}.
+     *
+     * @param string $error Error code
      *
-     * @param  string $error Error code
      * @return string Error message
      */
     public function getErrorMessage($error)
     {
         switch ($error) {
             case CURLE_UNSUPPORTED_PROTOCOL:
-                $error = "Unsupported protocol";
+                $error = 'Unsupported protocol';
                 break;
             case CURLE_FAILED_INIT:
-                $error = "Internal cUrl error?";
+                $error = 'Internal cUrl error?';
                 break;
             case CURLE_URL_MALFORMAT:
-                $error = "Malformed URL";
+                $error = 'Malformed URL';
                 break;
             case CURLE_COULDNT_RESOLVE_PROXY:
                 $error = "Couldn't resolve proxy";
@@ -63,13 +62,13 @@ public function getErrorMessage($error)
                 $error = "Couldn't resolve host";
                 break;
             case CURLE_COULDNT_CONNECT:
-                $error = "Couldn't connect to host, ElasticSearch down?";
+                $error = "Couldn't connect to host, Elasticsearch down?";
                 break;
             case 28:
-                $error = "Operation timed out";
+                $error = 'Operation timed out';
                 break;
             default:
-                $error = "Unknown error:" . $error;
+                $error = 'Unknown error:'.$error;
                 break;
         }
 
@@ -77,7 +76,7 @@ public function getErrorMessage($error)
     }
 
     /**
-     * Return Error code / message
+     * Return Error code / message.
      *
      * @return string Error code / message
      */
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ConnectionException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ConnectionException.php
index 35d6047..ab64935 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ConnectionException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ConnectionException.php
@@ -6,32 +6,26 @@
 use Elastica\Response;
 
 /**
- * Connection exception
+ * Connection exception.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class ConnectionException extends \RuntimeException implements ExceptionInterface
 {
     /**
-     * Request
-     *
      * @var \Elastica\Request Request object
      */
     protected $_request;
 
     /**
-     * Response
-     *
      * @var \Elastica\Response Response object
      */
     protected $_response;
 
     /**
-     * Construct Exception
+     * Construct Exception.
      *
-     * @param string            $message    Message
+     * @param string             $message  Message
      * @param \Elastica\Request  $request
      * @param \Elastica\Response $response
      */
@@ -44,7 +38,7 @@ public function __construct($message, Request $request = null, Response $respons
     }
 
     /**
-     * Returns request object
+     * Returns request object.
      *
      * @return \Elastica\Request Request object
      */
@@ -54,7 +48,7 @@ public function getRequest()
     }
 
     /**
-     * Returns response object
+     * Returns response object.
      *
      * @return \Elastica\Response Response object
      */
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/DeprecatedException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/DeprecatedException.php
new file mode 100755
index 0000000..e7d0bd8
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/DeprecatedException.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Elastica\Exception;
+
+/**
+ * Deprecated exception.
+ *
+ * Is thrown if a function or feature is deprecated and its usage can't be supported by BC layer
+ *
+ * @author Evgeniy Sokolov <ewgraf@gmail.com>
+ */
+class DeprecatedException extends NotImplementedException
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ElasticsearchException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ElasticsearchException.php
new file mode 100755
index 0000000..801151f
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ElasticsearchException.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Elastica\Exception;
+
+/**
+ * Elasticsearch exception.
+ *
+ * @author Ian Babrou <ibobrik@gmail.com>
+ */
+class ElasticsearchException extends \Exception implements ExceptionInterface
+{
+    const REMOTE_TRANSPORT_EXCEPTION = 'RemoteTransportException';
+
+    /**
+     * @var string|null Elasticsearch exception name
+     */
+    private $_exception;
+
+    /**
+     * @var bool Whether exception was local to server node or remote
+     */
+    private $_isRemote = false;
+
+    /**
+     * @var array Error array
+     */
+    protected $_error = array();
+
+    /**
+     * Constructs elasticsearch exception.
+     *
+     * @param int   $code  Error code
+     * @param array $error Error object from elasticsearch
+     */
+    public function __construct($code, $error)
+    {
+        $this->_error = $error;
+        // TODO: es2 improve as now an array
+        $this->_parseError(json_encode($error));
+        parent::__construct(json_encode($error), $code);
+    }
+
+    /**
+     * Parse error message from elasticsearch.
+     *
+     * @param string $error Error message
+     */
+    protected function _parseError($error)
+    {
+        $errors = explode(']; nested: ', $error);
+
+        if (count($errors) == 1) {
+            $this->_exception = $this->_extractException($errors[0]);
+        } else {
+            if ($this->_extractException($errors[0]) == self::REMOTE_TRANSPORT_EXCEPTION) {
+                $this->_isRemote = true;
+                $this->_exception = $this->_extractException($errors[1]);
+            } else {
+                $this->_exception = $this->_extractException($errors[0]);
+            }
+        }
+    }
+
+    /**
+     * Extract exception name from error response.
+     *
+     * @param string $error
+     *
+     * @return null|string
+     */
+    protected function _extractException($error)
+    {
+        if (preg_match('/^(\w+)\[.*\]/', $error, $matches)) {
+            return $matches[1];
+        } else {
+            return;
+        }
+    }
+
+    /**
+     * Returns elasticsearch exception name.
+     *
+     * @return string|null
+     */
+    public function getExceptionName()
+    {
+        return $this->_exception;
+    }
+
+    /**
+     * Returns whether exception was local to server node or remote.
+     *
+     * @return bool
+     */
+    public function isRemoteTransportException()
+    {
+        return $this->_isRemote;
+    }
+
+    /**
+     * @return array Error array
+     */
+    public function getError()
+    {
+        return $this->_error;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ExceptionInterface.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ExceptionInterface.php
index 746c9c8..0504a1d 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ExceptionInterface.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ExceptionInterface.php
@@ -3,10 +3,8 @@
 namespace Elastica\Exception;
 
 /**
- * General Elastica exception interface
+ * General Elastica exception interface.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 interface ExceptionInterface
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/InvalidException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/InvalidException.php
index ff4a4cd..ad11512 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/InvalidException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/InvalidException.php
@@ -3,10 +3,8 @@
 namespace Elastica\Exception;
 
 /**
- * Invalid exception
+ * Invalid exception.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class InvalidException extends \InvalidArgumentException implements ExceptionInterface
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/JSONParseException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/JSONParseException.php
new file mode 100755
index 0000000..de2d741
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/JSONParseException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Elastica\Exception;
+
+/**
+ * JSON Parse exception.
+ */
+class JSONParseException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/NotFoundException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/NotFoundException.php
index 539b01c..364c7f5 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/NotFoundException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/NotFoundException.php
@@ -3,10 +3,8 @@
 namespace Elastica\Exception;
 
 /**
- * Not found exception
+ * Not found exception.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class NotFoundException extends \RuntimeException implements ExceptionInterface
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/NotImplementedException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/NotImplementedException.php
index 49d3918..e73b584 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/NotImplementedException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/NotImplementedException.php
@@ -3,12 +3,10 @@
 namespace Elastica\Exception;
 
 /**
- * Not implemented exception
+ * Not implemented exception.
  *
  * Is thrown if a function or feature is not implemented yet
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class NotImplementedException extends \BadMethodCallException implements ExceptionInterface
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/PartialShardFailureException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/PartialShardFailureException.php
new file mode 100755
index 0000000..c984262
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/PartialShardFailureException.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Elastica\Exception;
+
+use Elastica\JSON;
+use Elastica\Request;
+use Elastica\Response;
+
+/**
+ * Partial shard failure exception.
+ *
+ * @author Ian Babrou <ibobrik@gmail.com>
+ */
+class PartialShardFailureException extends ResponseException
+{
+    /**
+     * Construct Exception.
+     *
+     * @param \Elastica\Request  $request
+     * @param \Elastica\Response $response
+     */
+    public function __construct(Request $request, Response $response)
+    {
+        parent::__construct($request, $response);
+
+        $shardsStatistics = $response->getShardsStatistics();
+        $this->message = JSON::stringify($shardsStatistics);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/QueryBuilderException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/QueryBuilderException.php
new file mode 100755
index 0000000..e047c67
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/QueryBuilderException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Elastica\Exception;
+
+/**
+ * QueryBuilder exception.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+class QueryBuilderException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ResponseException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ResponseException.php
index b697eab..e27a596 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ResponseException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/ResponseException.php
@@ -6,43 +6,37 @@
 use Elastica\Response;
 
 /**
- * Response exception
+ * Response exception.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class ResponseException extends \RuntimeException implements ExceptionInterface
 {
     /**
-     * Request
-     *
      * @var \Elastica\Request Request object
      */
     protected $_request = null;
 
     /**
-     * Response
-     *
      * @var \Elastica\Response Response object
      */
     protected $_response = null;
 
     /**
-     * Construct Exception
+     * Construct Exception.
      *
-     * @param \Elastica\Request $request
+     * @param \Elastica\Request  $request
      * @param \Elastica\Response $response
      */
     public function __construct(Request $request, Response $response)
     {
         $this->_request = $request;
         $this->_response = $response;
-        parent::__construct($response->getError());
+        parent::__construct($response->getErrorMessage());
     }
 
     /**
-     * Returns request object
+     * Returns request object.
      *
      * @return \Elastica\Request Request object
      */
@@ -52,7 +46,7 @@ public function getRequest()
     }
 
     /**
-     * Returns response object
+     * Returns response object.
      *
      * @return \Elastica\Response Response object
      */
@@ -60,4 +54,18 @@ public function getResponse()
     {
         return $this->_response;
     }
+
+    /**
+     * Returns elasticsearch exception.
+     *
+     * @return ElasticsearchException
+     */
+    public function getElasticsearchException()
+    {
+        $response = $this->getResponse();
+        $transfer = $response->getTransferInfo();
+        $code = array_key_exists('http_code', $transfer) ? $transfer['http_code'] : 0;
+
+        return new ElasticsearchException($code, $response->getErrorMessage());
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/RuntimeException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/RuntimeException.php
index 5ee420e..e9977e9 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/RuntimeException.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Exception/RuntimeException.php
@@ -3,10 +3,8 @@
 namespace Elastica\Exception;
 
 /**
- * Client exception
+ * Client exception.
  *
- * @category Xodoa
- * @package Elastica
  * @author Mikhail Shamin <munk13@gmail.com>
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractFilter.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractFilter.php
index 665f155..b2db7ca 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractFilter.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractFilter.php
@@ -5,21 +5,24 @@
 use Elastica\Exception\InvalidException;
 use Elastica\Param;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Abstract filter object. Should be extended by all filter types
+ * Abstract filter object. Should be extended by all filter types.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-filters.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 abstract class AbstractFilter extends Param
 {
     /**
-     * Sets the filter cache
+     * Sets the filter cache.
+     *
+     * @param bool $cached Cached
      *
-     * @param  boolean                        $cached Cached
-     * @return \Elastica\Filter\AbstractFilter
+     * @return $this
      */
     public function setCached($cached = true)
     {
@@ -27,11 +30,13 @@ public function setCached($cached = true)
     }
 
     /**
-     * Sets the filter cache key
+     * Sets the filter cache key.
      *
-     * @param  string                              $cacheKey Cache key
-     * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Filter\AbstractFilter
+     * @param string $cacheKey Cache key
+     *
+     * @throws \Elastica\Exception\InvalidException If given key is empty
+     *
+     * @return $this
      */
     public function setCacheKey($cacheKey)
     {
@@ -45,10 +50,11 @@ public function setCacheKey($cacheKey)
     }
 
     /**
-     * Sets the filter name
+     * Sets the filter name.
+     *
+     * @param string $name Name
      *
-     * @param  string                         $name Name
-     * @return \Elastica\Filter\AbstractFilter
+     * @return $this
      */
     public function setName($name)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractGeoDistance.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractGeoDistance.php
index 997ceab..cdd43d5 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractGeoDistance.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractGeoDistance.php
@@ -4,22 +4,23 @@
 
 use Elastica\Exception\InvalidException;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Geo distance filter
+ * Geo distance filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/geo-distance-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 abstract class AbstractGeoDistance extends AbstractFilter
 {
-
     const LOCATION_TYPE_GEOHASH = 'geohash';
     const LOCATION_TYPE_LATLON = 'latlon';
 
     /**
-     * Location type
+     * Location type.
      *
      * Decides if this filter uses latitude/longitude or geohash for the location.
      * Values are "latlon" or "geohash".
@@ -29,38 +30,39 @@ abstract class AbstractGeoDistance extends AbstractFilter
     protected $_locationType = null;
 
     /**
-     * Key
+     * Key.
      *
      * @var string
      */
     protected $_key = null;
 
     /**
-     * Latitude
+     * Latitude.
      *
      * @var float
      */
     protected $_latitude = null;
 
     /**
-     * Longitude
+     * Longitude.
      *
      * @var float
      */
     protected $_longitude = null;
 
     /**
-     * Geohash
+     * Geohash.
      *
      * @var string
      */
     protected $_geohash = null;
 
     /**
-     * Create GeoDistance object
+     * Create GeoDistance object.
+     *
+     * @param string       $key      Key
+     * @param array|string $location Location as array or geohash: array('lat' => 48.86, 'lon' => 2.35) OR 'drm3btev3e86'
      *
-     * @param  string                              $key      Key
-     * @param  array|string                        $location Location as array or geohash: array('lat' => 48.86, 'lon' => 2.35) OR 'drm3btev3e86'
      * @internal param string $distance Distance
      */
     public function __construct($key, $location)
@@ -71,8 +73,9 @@ public function __construct($key, $location)
     }
 
     /**
-     * @param  string                                    $key
-     * @return \Elastica\Filter\AbstractGeoDistance current filter
+     * @param string $key
+     *
+     * @return $this
      */
     public function setKey($key)
     {
@@ -82,9 +85,11 @@ public function setKey($key)
     }
 
     /**
-     * @param  array|string                              $location
-     * @return \Elastica\Filter\AbstractGeoDistance
+     * @param array|string $location
+     *
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
      */
     public function setLocation($location)
     {
@@ -113,8 +118,9 @@ public function setLocation($location)
     }
 
     /**
-     * @param  float                                     $latitude
-     * @return \Elastica\Filter\AbstractGeoDistance current filter
+     * @param float $latitude
+     *
+     * @return $this
      */
     public function setLatitude($latitude)
     {
@@ -125,8 +131,9 @@ public function setLatitude($latitude)
     }
 
     /**
-     * @param  float                                     $longitude
-     * @return \Elastica\Filter\AbstractGeoDistance current filter
+     * @param float $longitude
+     *
+     * @return $this
      */
     public function setLongitude($longitude)
     {
@@ -137,8 +144,9 @@ public function setLongitude($longitude)
     }
 
     /**
-     * @param  string                                    $geohash
-     * @return \Elastica\Filter\AbstractGeoDistance current filter
+     * @param string $geohash
+     *
+     * @return $this
      */
     public function setGeohash($geohash)
     {
@@ -149,8 +157,9 @@ public function setGeohash($geohash)
     }
 
     /**
-     * @return array|string
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return array|string
      */
     protected function _getLocationData()
     {
@@ -179,7 +188,10 @@ protected function _getLocationData()
 
     /**
      * @see \Elastica\Param::toArray()
+     *
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return array
      */
     public function toArray()
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractGeoShape.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractGeoShape.php
new file mode 100755
index 0000000..293ed6d
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractGeoShape.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Elastica\Filter;
+
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
+/**
+ * geo_shape filter.
+ *
+ * Filter pre-indexed shape definitions
+ *
+ * @author Bennie Krijger <benniekrijger@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
+ */
+abstract class AbstractGeoShape extends AbstractFilter
+{
+    const RELATION_INTERSECT = 'intersects';
+    const RELATION_DISJOINT = 'disjoint';
+    const RELATION_CONTAINS = 'within';
+
+    /**
+     * @var string
+     *
+     * elasticsearch path of the pre-indexed shape
+     */
+    protected $_path;
+
+    /**
+     * @var string
+     *
+     * the relation of the 2 shaped: intersects, disjoint, within
+     */
+    protected $_relation = self::RELATION_INTERSECT;
+
+    /**
+     * @param string $relation
+     *
+     * @return $this
+     */
+    public function setRelation($relation)
+    {
+        $this->_relation = $relation;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRelation()
+    {
+        return $this->_relation;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractMulti.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractMulti.php
index 53ef74c..0693e5b 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractMulti.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/AbstractMulti.php
@@ -2,39 +2,54 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Multi Abstract filter object. Should be extended by filter types composed of an array of sub filters
+ * Multi Abstract filter object. Should be extended by filter types composed of an array of sub filters.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
+ *
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 abstract class AbstractMulti extends AbstractFilter
 {
     /**
-     * Filters
+     * Filters.
+     *
      * @var array
      */
     protected $_filters = array();
 
     /**
-     * Add filter
+     * @param array $filters
+     */
+    public function __construct(array $filters = array())
+    {
+        if (!empty($filters)) {
+            $this->setFilters($filters);
+        }
+    }
+
+    /**
+     * Add filter.
      *
-     * @param  \Elastica\Filter\AbstractFilter      $filter
-     * @return \Elastica\Filter\AbstractMulti
+     * @param \Elastica\Filter\AbstractFilter $filter
+     *
+     * @return $this
      */
     public function addFilter(AbstractFilter $filter)
     {
-        $this->_filters[] = $filter->toArray();
+        $this->_filters[] = $filter;
 
         return $this;
     }
 
     /**
-     * Set filters
+     * Set filters.
+     *
+     * @param array $filters
      *
-     * @param  array                               $filters
-     * @return \Elastica\Filter\AbstractMulti
+     * @return $this
      */
     public function setFilters(array $filters)
     {
@@ -57,6 +72,8 @@ public function getFilters()
 
     /**
      * @see \Elastica\Param::toArray()
+     *
+     * @return array
      */
     public function toArray()
     {
@@ -72,6 +89,6 @@ public function toArray()
 
         $data[$name] = $filterData;
 
-        return $data;
+        return $this->_convertArrayable($data);
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Bool.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Bool.php
index 7eadc42..eecf655 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Bool.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Bool.php
@@ -2,137 +2,18 @@
 
 namespace Elastica\Filter;
 
-use Elastica\Exception\InvalidException;
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
 
 /**
- * Bool Filter
+ * Bool Filter.
+ *
+ * This class is for backward compatibility reason for all php < 7 versions. For PHP 7 and above use BoolFilter as Bool is reserved.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/bool-query.html
+ *
+ * @deprecated Use BoolFilter instead. From PHP7 bool is reserved word and this class will be removed in further Elastica releases
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html
  */
-class Bool extends AbstractFilter
+class Bool extends BoolFilter
 {
-    /**
-     * @var float
-     */
-    protected $_boost = 1.0;
-
-    /**
-     * Must
-     *
-     * @var array
-     */
-    protected $_must = array();
-
-    /**
-     * Should
-     *
-     * @var array
-     */
-    protected $_should = array();
-
-    /**
-     * Must not
-     *
-     * @var array
-     */
-    protected $_mustNot = array();
-
-    /**
-     * Adds should filter
-     *
-     * @param  array|\Elastica\Filter\AbstractFilter $args Filter data
-     * @return \Elastica\Filter\Bool           Current object
-     */
-    public function addShould($args)
-    {
-        return $this->_addFilter('should', $args);
-    }
-
-    /**
-     * Adds must filter
-     *
-     * @param  array|\Elastica\Filter\AbstractFilter $args Filter data
-     * @return \Elastica\Filter\Bool           Current object
-     */
-    public function addMust($args)
-    {
-        return $this->_addFilter('must', $args);
-    }
-
-    /**
-     * Adds mustNot filter
-     *
-     * @param  array|\Elastica\Filter\AbstractFilter $args Filter data
-     * @return \Elastica\Filter\Bool           Current object
-     */
-    public function addMustNot($args)
-    {
-        return $this->_addFilter('mustNot', $args);
-    }
-
-    /**
-     * Adds general filter based on type
-     *
-     * @param  string                               $type Filter type
-     * @param  array|\Elastica\Filter\AbstractFilter $args Filter data
-     * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Filter\Bool           Current object
-     */
-    protected function _addFilter($type, $args)
-    {
-        if ($args instanceof AbstractFilter) {
-            $args = $args->toArray();
-        }
-
-        if (!is_array($args)) {
-            throw new InvalidException('Invalid parameter. Has to be array or instance of Elastica\Filter');
-        }
-
-        $varName = '_' . $type;
-        $this->{$varName}[] = $args;
-
-        return $this;
-    }
-
-    /**
-     * Converts bool filter to array
-     *
-     * @see \Elastica\Filter\AbstractFilter::toArray()
-     * @return array Filter array
-     */
-    public function toArray()
-    {
-        $args = array();
-
-        if (!empty($this->_must)) {
-            $args['bool']['must'] = $this->_must;
-        }
-
-        if (!empty($this->_should)) {
-            $args['bool']['should'] = $this->_should;
-        }
-
-        if (!empty($this->_mustNot)) {
-            $args['bool']['must_not'] = $this->_mustNot;
-        }
-
-        return $args;
-    }
-
-    /**
-     * Sets the boost value for this filter
-     *
-     * @param  float                      $boost Boost
-     * @return \Elastica\Filter\Bool Current object
-     */
-    public function setBoost($boost)
-    {
-        $this->_boost = $boost;
-
-        return $this;
-    }
-
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolAnd.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolAnd.php
index 2fd19f8..abecf20 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolAnd.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolAnd.php
@@ -2,13 +2,15 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use BoolQuery::addMust. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * And Filter
+ * And Filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Lee Parker, Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/and-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-and-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class BoolAnd extends AbstractMulti
 {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolFilter.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolFilter.php
new file mode 100755
index 0000000..f2010c9
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolFilter.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Elastica\Filter;
+
+use Elastica\Exception\InvalidException;
+
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
+/**
+ * Bool Filter.
+ *
+ * @author Nicolas Ruflin <spam@ruflin.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
+ */
+class BoolFilter extends AbstractFilter
+{
+    /**
+     * Must.
+     *
+     * @var array
+     */
+    protected $_must = array();
+
+    /**
+     * Should.
+     *
+     * @var array
+     */
+    protected $_should = array();
+
+    /**
+     * Must not.
+     *
+     * @var array
+     */
+    protected $_mustNot = array();
+
+    /**
+     * Adds should filter.
+     *
+     * @param array|\Elastica\Filter\AbstractFilter $args Filter data
+     *
+     * @return $this
+     */
+    public function addShould($args)
+    {
+        return $this->_addFilter('should', $args);
+    }
+
+    /**
+     * Adds must filter.
+     *
+     * @param array|\Elastica\Filter\AbstractFilter $args Filter data
+     *
+     * @return $this
+     */
+    public function addMust($args)
+    {
+        return $this->_addFilter('must', $args);
+    }
+
+    /**
+     * Adds mustNot filter.
+     *
+     * @param array|\Elastica\Filter\AbstractFilter $args Filter data
+     *
+     * @return $this
+     */
+    public function addMustNot($args)
+    {
+        return $this->_addFilter('mustNot', $args);
+    }
+
+    /**
+     * Adds general filter based on type.
+     *
+     * @param string                                $type Filter type
+     * @param array|\Elastica\Filter\AbstractFilter $args Filter data
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
+     */
+    protected function _addFilter($type, $args)
+    {
+        if (!is_array($args) && !($args instanceof AbstractFilter)) {
+            throw new InvalidException('Invalid parameter. Has to be array or instance of Elastica\Filter');
+        }
+
+        if (is_array($args)) {
+            $parsedArgs = array();
+
+            foreach ($args as $filter) {
+                if ($filter instanceof AbstractFilter) {
+                    $parsedArgs[] = $filter;
+                }
+            }
+
+            $args = $parsedArgs;
+        }
+
+        $varName = '_'.$type;
+        $this->{$varName}[] = $args;
+
+        return $this;
+    }
+
+    /**
+     * Converts bool filter to array.
+     *
+     * @see \Elastica\Filter\AbstractFilter::toArray()
+     *
+     * @return array Filter array
+     */
+    public function toArray()
+    {
+        $args = array();
+
+        if (!empty($this->_must)) {
+            $args['bool']['must'] = $this->_must;
+        }
+
+        if (!empty($this->_should)) {
+            $args['bool']['should'] = $this->_should;
+        }
+
+        if (!empty($this->_mustNot)) {
+            $args['bool']['must_not'] = $this->_mustNot;
+        }
+
+        if (isset($args['bool'])) {
+            $args['bool'] = array_merge($args['bool'], $this->getParams());
+        }
+
+        return $this->_convertArrayable($args);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolNot.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolNot.php
index 1778997..9fd71ff 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolNot.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolNot.php
@@ -2,18 +2,20 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use BoolQuery::addMustNot. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Not Filter
+ * Not Filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Lee Parker, Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/not-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-not-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class BoolNot extends AbstractFilter
 {
     /**
-     * Creates Not filter query
+     * Creates Not filter query.
      *
      * @param \Elastica\Filter\AbstractFilter $filter Filter object
      */
@@ -23,14 +25,15 @@ public function __construct(AbstractFilter $filter)
     }
 
     /**
-     * Set filter
+     * Set filter.
+     *
+     * @param \Elastica\Filter\AbstractFilter $filter
      *
-     * @param  \Elastica\Filter\AbstractFilter $filter
-     * @return \Elastica\Filter\BoolNot
+     * @return $this
      */
     public function setFilter(AbstractFilter $filter)
     {
-        return $this->setParam('filter', $filter->toArray());
+        return $this->setParam('filter', $filter);
     }
 
     /**
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolOr.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolOr.php
index 6f63fc3..75503f0 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolOr.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/BoolOr.php
@@ -2,13 +2,15 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use BoolQuery::addShould. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Or Filter
+ * Or Filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/or-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-or-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class BoolOr extends AbstractMulti
 {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Exists.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Exists.php
index 6fe43e3..873a2c8 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Exists.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Exists.php
@@ -2,18 +2,20 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Exists query
+ * Exists query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Oleg Cherniy <oleg.cherniy@gmail.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/exists-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Exists extends AbstractFilter
 {
     /**
-     * Construct exists filter
+     * Construct exists filter.
      *
      * @param string $field
      */
@@ -23,10 +25,11 @@ public function __construct($field)
     }
 
     /**
-     * Set field
+     * Set field.
+     *
+     * @param string $field
      *
-     * @param  string                       $field
-     * @return \Elastica\Filter\Exists
+     * @return $this
      */
     public function setField($field)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoBoundingBox.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoBoundingBox.php
index 1462e9a..6cc698a 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoBoundingBox.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoBoundingBox.php
@@ -4,18 +4,20 @@
 
 use Elastica\Exception\InvalidException;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Geo bounding box filter
+ * Geo bounding box filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Fabian Vogler <fabian@equivalence.ch>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/geo-bounding-box-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-bounding-box-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoBoundingBox extends AbstractFilter
 {
     /**
-     * Construct BoundingBoxFilter
+     * Construct BoundingBoxFilter.
      *
      * @param string $key         Key
      * @param array  $coordinates Array with top left coordinate as first and bottom right coordinate as second element
@@ -26,12 +28,14 @@ public function __construct($key, array $coordinates)
     }
 
     /**
-     * Add coordinates
+     * Add coordinates.
+     *
+     * @param string $key         Key
+     * @param array  $coordinates Array with top left coordinate as first and bottom right coordinate as second element
+     *
+     * @throws \Elastica\Exception\InvalidException If $coordinates doesn't have two elements
      *
-     * @param  string                               $key         Key
-     * @param  array                                $coordinates Array with top left coordinate as first and bottom right coordinate as second element
-     * @throws \Elastica\Exception\InvalidException  If $coordinates doesn't have two elements
-     * @return \Elastica\Filter\GeoBoundingBox Current object
+     * @return $this
      */
     public function addCoordinates($key, array $coordinates)
     {
@@ -41,7 +45,7 @@ public function addCoordinates($key, array $coordinates)
 
         $this->setParam($key, array(
             'top_left' => $coordinates[0],
-            'bottom_right' => $coordinates[1]
+            'bottom_right' => $coordinates[1],
         ));
 
         return $this;
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoDistance.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoDistance.php
index 8e87536..2ee5cf5 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoDistance.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoDistance.php
@@ -2,29 +2,33 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Geo distance filter
+ * Geo distance filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/geo-distance-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoDistance extends AbstractGeoDistance
 {
     const DISTANCE_TYPE_ARC = 'arc';
     const DISTANCE_TYPE_PLANE = 'plane';
+    const DISTANCE_TYPE_SLOPPY_ARC = 'sloppy_arc';
 
     const OPTIMIZE_BBOX_MEMORY = 'memory';
     const OPTIMIZE_BBOX_INDEXED = 'indexed';
     const OPTIMIZE_BBOX_NONE = 'none';
 
     /**
-     * Create GeoDistance object
+     * Create GeoDistance object.
+     *
+     * @param string       $key      Key
+     * @param array|string $location Location as array or geohash: array('lat' => 48.86, 'lon' => 2.35) OR 'drm3btev3e86'
+     * @param string       $distance Distance
      *
-     * @param  string                              $key      Key
-     * @param  array|string                        $location Location as array or geohash: array('lat' => 48.86, 'lon' => 2.35) OR 'drm3btev3e86'
-     * @param  string                              $distance Distance
      * @throws \Elastica\Exception\InvalidException
      */
     public function __construct($key, $location, $distance)
@@ -35,8 +39,9 @@ public function __construct($key, $location, $distance)
     }
 
     /**
-     * @param  string                            $distance
-     * @return \Elastica\Filter\GeoDistance current filter
+     * @param string $distance
+     *
+     * @return $this
      */
     public function setDistance($distance)
     {
@@ -46,10 +51,11 @@ public function setDistance($distance)
     }
 
     /**
-     * See DISTANCE_TYPE_* constants
+     * See DISTANCE_TYPE_* constants.
+     *
+     * @param string $distanceType
      *
-     * @param  string                            $distanceType
-     * @return \Elastica\Filter\GeoDistance current filter
+     * @return $this
      */
     public function setDistanceType($distanceType)
     {
@@ -59,10 +65,11 @@ public function setDistanceType($distanceType)
     }
 
     /**
-     * See OPTIMIZE_BBOX_* constants
+     * See OPTIMIZE_BBOX_* constants.
+     *
+     * @param string $optimizeBbox
      *
-     * @param  string                            $optimizeBbox
-     * @return \Elastica\Filter\GeoDistance current filter
+     * @return $this
      */
     public function setOptimizeBbox($optimizeBbox)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoDistanceRange.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoDistanceRange.php
index 230e5eb..d7b30e9 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoDistanceRange.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoDistanceRange.php
@@ -4,13 +4,15 @@
 
 use Elastica\Exception\InvalidException;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Geo distance filter
+ * Geo distance filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author munkie
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/geo-distance-range-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-range-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoDistanceRange extends AbstractGeoDistance
 {
@@ -33,6 +35,7 @@ class GeoDistanceRange extends AbstractGeoDistance
      * @param string       $key
      * @param array|string $location
      * @param array        $ranges
+     *
      * @internal param string $distance
      */
     public function __construct($key, $location, array $ranges = array())
@@ -45,8 +48,9 @@ public function __construct($key, $location, array $ranges = array())
     }
 
     /**
-     * @param  array                                  $ranges
-     * @return \Elastica\Filter\GeoDistanceRange
+     * @param array $ranges
+     *
+     * @return $this
      */
     public function setRanges(array $ranges)
     {
@@ -60,10 +64,12 @@ public function setRanges(array $ranges)
     }
 
     /**
-     * @param  string                                 $key
-     * @param  mixed                                  $value
-     * @return \Elastica\Filter\GeoDistanceRange
+     * @param string $key
+     * @param mixed  $value
+     *
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
      */
     public function setRange($key, $value)
     {
@@ -80,7 +86,7 @@ public function setRange($key, $value)
                 $value = (boolean) $value;
                 break;
             default:
-                throw new InvalidException('Invalid range parameter given: ' . $key);
+                throw new InvalidException('Invalid range parameter given: '.$key);
         }
         $this->_ranges[$key] = $value;
 
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoPolygon.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoPolygon.php
index fa12c03..3f9d53a 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoPolygon.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoPolygon.php
@@ -2,34 +2,34 @@
 
 namespace Elastica\Filter;
 
-use Elastica\Filter\AbstractFilter;
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
 
 /**
- * Geo polygon filter
+ * Geo polygon filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Michael Maclean <mgdm@php.net>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/geo-polygon-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-polygon-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoPolygon extends AbstractFilter
 {
     /**
-     * Key
+     * Key.
      *
      * @var string Key
      */
     protected $_key = '';
 
     /**
-     * Points making up polygon
+     * Points making up polygon.
      *
      * @var array Points making up polygon
      */
     protected $_points = array();
 
     /**
-     * Construct polygon filter
+     * Construct polygon filter.
      *
      * @param string $key    Key
      * @param array  $points Points making up polygon
@@ -41,9 +41,10 @@ public function __construct($key, array $points)
     }
 
     /**
-     * Converts filter to array
+     * Converts filter to array.
      *
      * @see \Elastica\Filter\AbstractFilter::toArray()
+     *
      * @return array
      */
     public function toArray()
@@ -51,9 +52,9 @@ public function toArray()
         return array(
             'geo_polygon' => array(
                 $this->_key => array(
-                    'points' => $this->_points
+                    'points' => $this->_points,
                 ),
-            )
+            ),
         );
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoShapePreIndexed.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoShapePreIndexed.php
new file mode 100755
index 0000000..4ed70b0
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoShapePreIndexed.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Elastica\Filter;
+
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
+/**
+ * geo_shape filter for pre-indexed shapes.
+ *
+ * Filter pre-indexed shape definitions
+ *
+ * @author Bennie Krijger <benniekrijger@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
+ */
+class GeoShapePreIndexed extends AbstractGeoShape
+{
+    /**
+     * elasticsearch id of the pre-indexed shape.
+     *
+     * @var string
+     */
+    protected $_indexedId;
+
+    /**
+     * elasticsearch type of the pre-indexed shape.
+     *
+     * @var string
+     */
+    protected $_indexedType;
+
+    /**
+     *  elasticsearch index of the pre-indexed shape.
+     *
+     * @var string
+     */
+    protected $_indexedIndex;
+
+    /**
+     *  elasticsearch path/field name of the pre-indexed shape.
+     *
+     * @var string
+     */
+    protected $_indexedPath;
+
+    /**
+     * Construct geo_shape filter with a pre-indexed shape.
+     *
+     * @param string $path         The path/field of the shape searched
+     * @param string $indexedId    Id of the pre-indexed shape
+     * @param string $indexedType  Type of the pre-indexed shape
+     * @param string $indexedIndex Index of the pre-indexed shape
+     * @param string $indexedPath  Path of the pre-indexed shape
+     */
+    public function __construct($path, $indexedId, $indexedType, $indexedIndex, $indexedPath)
+    {
+        $this->_path = $path;
+        $this->_indexedId = $indexedId;
+        $this->_indexedType = $indexedType;
+        $this->_indexedIndex = $indexedIndex;
+        $this->_indexedPath = $indexedPath;
+    }
+
+    /**
+     * Converts filter to array.
+     *
+     * @see \Elastica\Filter\AbstractFilter::toArray()
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return array(
+            'geo_shape' => array(
+                $this->_path => array(
+                    'indexed_shape' => array(
+                        'id' => $this->_indexedId,
+                        'type' => $this->_indexedType,
+                        'index' => $this->_indexedIndex,
+                        'path' => $this->_indexedPath,
+                    ),
+                    'relation' => $this->_relation,
+                ),
+            ),
+        );
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoShapeProvided.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoShapeProvided.php
new file mode 100755
index 0000000..0486725
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeoShapeProvided.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Elastica\Filter;
+
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
+/**
+ * geo_shape filter or provided shapes.
+ *
+ * Filter provided shape definitions
+ *
+ * @author BennieKrijger <benniekrijger@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
+ */
+class GeoShapeProvided extends AbstractGeoShape
+{
+    const TYPE_ENVELOPE = 'envelope';
+    const TYPE_MULTIPOINT = 'multipoint';
+    const TYPE_POINT = 'point';
+    const TYPE_MULTIPOLYGON = 'multipolygon';
+    const TYPE_LINESTRING = 'linestring';
+    const TYPE_POLYGON = 'polygon';
+
+    /**
+     * Type of the geo_shape.
+     *
+     * @var string
+     */
+    protected $_shapeType;
+
+    /**
+     * Coordinates making up geo_shape.
+     *
+     * @var array Coordinates making up geo_shape
+     */
+    protected $_coordinates;
+
+    /**
+     * Construct geo_shape filter.
+     *
+     * @param string $path        The path/field of the shape searched
+     * @param array  $coordinates Points making up the shape
+     * @param string $shapeType   Type of the geo_shape:
+     *                            point, envelope, linestring, polygon,
+     *                            multipoint or multipolygon
+     */
+    public function __construct($path, array $coordinates, $shapeType = self::TYPE_ENVELOPE)
+    {
+        $this->_path = $path;
+        $this->_shapeType = $shapeType;
+        $this->_coordinates = $coordinates;
+    }
+
+    /**
+     * Converts filter to array.
+     *
+     * @see \Elastica\Filter\AbstractFilter::toArray()
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return array(
+            'geo_shape' => array(
+                $this->_path => array(
+                    'shape' => array(
+                        'type' => $this->_shapeType,
+                        'coordinates' => $this->_coordinates,
+                        'relation' => $this->_relation,
+                    ),
+                ),
+            ),
+        );
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeohashCell.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeohashCell.php
index d14b25f..91b6ad4 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeohashCell.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/GeohashCell.php
@@ -2,19 +2,21 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
 
 /**
- * Class GeohashCell
- * @package Elastica
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/geohash-cell-filter/
+ * Class GeohashCell.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geohash-cell-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeohashCell extends AbstractGeoDistance
 {
     /**
-     * @param string $key The field on which to filter
-     * @param array|string $location Location as coordinates array or geohash string ['lat' => 40.3, 'lon' => 45.2]
-     * @param $precision Integer length of geohash prefix or distance (3, or "50m")
-     * @param bool $neighbors If true, filters cells next to the given cell.
+     * @param string       $key       The field on which to filter
+     * @param array|string $location  Location as coordinates array or geohash string ['lat' => 40.3, 'lon' => 45.2]
+     * @param string|int   $precision Integer length of geohash prefix or distance (3, or "50m")
+     * @param bool         $neighbors If true, filters cells next to the given cell.
      */
     public function __construct($key, $location, $precision = -1, $neighbors = false)
     {
@@ -24,9 +26,11 @@ public function __construct($key, $location, $precision = -1, $neighbors = false
     }
 
     /**
-     * Set the precision for this filter
+     * Set the precision for this filter.
+     *
      * @param string|int $precision Integer length of geohash prefix or distance (3, or "50m")
-     * @return \Elastica\Filter\GeohashCell
+     *
+     * @return $this
      */
     public function setPrecision($precision)
     {
@@ -34,12 +38,14 @@ public function setPrecision($precision)
     }
 
     /**
-     * Set the neighbors option for this filter
+     * Set the neighbors option for this filter.
+     *
      * @param bool $neighbors If true, filters cells next to the given cell.
-     * @return \Elastica\Filter\GeohashCell
+     *
+     * @return $this
      */
     public function setNeighbors($neighbors)
     {
-        return $this->setParam('neighbors', (bool)$neighbors);
+        return $this->setParam('neighbors', (bool) $neighbors);
     }
-}
\ No newline at end of file
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/HasChild.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/HasChild.php
index 7c61086..08f54ef 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/HasChild.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/HasChild.php
@@ -2,61 +2,111 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Returns parent documents having child docs matching the query
+ * Returns parent documents having child docs matching the query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Fabian Vogler <fabian@equivalence.ch>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/has-child-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-child-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class HasChild extends AbstractFilter
 {
     /**
-     * Construct HasChild filter
+     * Construct HasChild filter.
      *
-     * @param string|\Elastica\Query $query Query string or a Elastica\Query object
-     * @param string                $type  Parent document type
+     * @param string|\Elastica\Query|\Elastica\Filter\AbstractFilter $query Query string or a Elastica\Query object or a filter
+     * @param string|\Elastica\Type                                  $type  Child document type
      */
     public function __construct($query, $type = null)
     {
-        $this->setQuery($query);
         $this->setType($type);
+        if ($query instanceof AbstractFilter) {
+            $this->setFilter($query);
+        } else {
+            $this->setQuery($query);
+        }
     }
 
     /**
-     * Sets query object
+     * Sets query object.
      *
-     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
-     * @return \Elastica\Filter\HasChild                     Current object
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
+     *
+     * @return $this
      */
     public function setQuery($query)
     {
-        $query = \Elastica\Query::create($query);
-        $data = $query->toArray();
+        return $this->setParam('query', \Elastica\Query::create($query));
+    }
 
-        return $this->setParam('query', $data['query']);
+    /**
+     * Sets the filter object.
+     *
+     * @param \Elastica\Filter\AbstractFilter $filter
+     *
+     * @return $this
+     */
+    public function setFilter($filter)
+    {
+        return $this->setParam('filter', $filter);
     }
 
     /**
-     * Set type of the parent document
+     * Set type of the child document.
      *
-     * @param  string                         $type Parent document type
-     * @return \Elastica\Filter\HasChild Current object
+     * @param string|\Elastica\Type $type Child document type
+     *
+     * @return $this
      */
     public function setType($type)
     {
-        return $this->setParam('type', $type);
+        if ($type instanceof \Elastica\Type) {
+            $type = $type->getName();
+        }
+
+        return $this->setParam('type', (string) $type);
     }
 
     /**
-     * Sets the scope
+     * Set minimum number of children are required to match for the parent doc to be considered a match.
      *
-     * @param  string                         $scope Scope
-     * @return \Elastica\Filter\HasChild Current object
+     * @param int $count
+     *
+     * @return $this
      */
-    public function setScope($scope)
+    public function setMinimumChildrenCount($count)
     {
-        return $this->setParam('_scope', $scope);
+        return $this->setParam('min_children', (int) $count);
+    }
+
+    /**
+     * Set maximum number of children are required to match for the parent doc to be considered a match.
+     *
+     * @param int $count
+     *
+     * @return $this
+     */
+    public function setMaximumChildrenCount($count)
+    {
+        return $this->setParam('max_children', (int) $count);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        $baseName = $this->_getBaseName();
+
+        if (isset($array[$baseName]['query'])) {
+            $array[$baseName]['query'] = $array[$baseName]['query']['query'];
+        }
+
+        return $array;
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/HasParent.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/HasParent.php
index b53748e..ca88ed4 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/HasParent.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/HasParent.php
@@ -2,60 +2,85 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Returns child documents having parent docs matching the query
+ * Returns child documents having parent docs matching the query.
  *
- * @category Xodoa
- * @package Elastica
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/has-parent-filter.html
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-parent-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class HasParent extends AbstractFilter
 {
     /**
-     * Construct HasParent filter
+     * Construct HasParent filter.
      *
-     * @param string|\Elastica\Query $query Query string or a Query object
-     * @param string                $type  Parent document type
+     * @param string|\Elastica\Query|\Elastica\Filter\AbstractFilter $query Query string or a Query object or a filter
+     * @param string|\Elastica\Type                                  $type  Parent document type
      */
     public function __construct($query, $type)
     {
-        $this->setQuery($query);
+        if ($query instanceof AbstractFilter) {
+            $this->setFilter($query);
+        } else {
+            $this->setQuery($query);
+        }
         $this->setType($type);
     }
 
     /**
-     * Sets query object
+     * Sets query object.
+     *
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
      *
-     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
-     * @return \Elastica\Filter\HasParent                    Current object
+     * @return $this
      */
     public function setQuery($query)
     {
-        $query = \Elastica\Query::create($query);
-        $data = $query->toArray();
+        return $this->setParam('query', \Elastica\Query::create($query));
+    }
 
-        return $this->setParam('query', $data['query']);
+    /**
+     * Sets filter object.
+     *
+     * @param \Elastica\Filter\AbstractFilter $filter
+     *
+     * @return $this
+     */
+    public function setFilter($filter)
+    {
+        return $this->setParam('filter', $filter);
     }
 
     /**
-     * Set type of the parent document
+     * Set type of the parent document.
+     *
+     * @param string|\Elastica\Type $type Parent document type
      *
-     * @param  string                          $type Parent document type
-     * @return \Elastica\Filter\HasParent Current object
+     * @return $this
      */
     public function setType($type)
     {
-        return $this->setParam('type', $type);
+        if ($type instanceof \Elastica\Type) {
+            $type = $type->getName();
+        }
+
+        return $this->setParam('type', (string) $type);
     }
 
     /**
-     * Sets the scope
-     *
-     * @param  string                          $scope Scope
-     * @return \Elastica\Filter\HasParent Current object
+     * {@inheritdoc}
      */
-    public function setScope($scope)
+    public function toArray()
     {
-        return $this->setParam('_scope', $scope);
+        $array = parent::toArray();
+
+        $baseName = $this->_getBaseName();
+
+        if (isset($array[$baseName]['query'])) {
+            $array[$baseName]['query'] = $array[$baseName]['query']['query'];
+        }
+
+        return $array;
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Ids.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Ids.php
index fd1d977..1a4f6cb 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Ids.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Ids.php
@@ -4,21 +4,23 @@
 
 use Elastica\Type as ElasticaType;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Ids Filter
+ * Ids Filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Lee Parker, Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/ids-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Ids extends AbstractFilter
 {
     /**
-     * Creates filter object
+     * Creates filter object.
      *
      * @param string|\Elastica\Type $type Type to filter on
-     * @param array                $ids  List of ids
+     * @param array                 $ids  List of ids
      */
     public function __construct($type = null, array $ids = array())
     {
@@ -27,10 +29,11 @@ public function __construct($type = null, array $ids = array())
     }
 
     /**
-     * Adds one more filter to the and filter
+     * Adds one more filter to the and filter.
+     *
+     * @param string $id Adds id to filter
      *
-     * @param  string                    $id Adds id to filter
-     * @return \Elastica\Filter\Ids Current object
+     * @return $this
      */
     public function addId($id)
     {
@@ -38,10 +41,11 @@ public function addId($id)
     }
 
     /**
-     * Adds one more type to query
+     * Adds one more type to query.
      *
-     * @param  string|\Elastica\Type      $type Type name or object
-     * @return \Elastica\Filter\Ids Current object
+     * @param string|\Elastica\Type $type Type name or object
+     *
+     * @return $this
      */
     public function addType($type)
     {
@@ -57,10 +61,11 @@ public function addType($type)
     }
 
     /**
-     * Set type
+     * Set type.
+     *
+     * @param string|\Elastica\Type $type Type name or object
      *
-     * @param  string|\Elastica\Type      $type Type name or object
-     * @return \Elastica\Filter\Ids Current object
+     * @return $this
      */
     public function setType($type)
     {
@@ -76,10 +81,11 @@ public function setType($type)
     }
 
     /**
-     * Sets the ids to filter
+     * Sets the ids to filter.
+     *
+     * @param array|string $ids List of ids
      *
-     * @param  array|string              $ids List of ids
-     * @return \Elastica\Filter\Ids Current object
+     * @return $this
      */
     public function setIds($ids)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Indices.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Indices.php
new file mode 100755
index 0000000..564d394
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Indices.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Elastica\Filter;
+
+use Elastica\Index as ElasticaIndex;
+
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
+/**
+ * Class Indices.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-indices-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
+ */
+class Indices extends AbstractFilter
+{
+    /**
+     * @param AbstractFilter $filter  filter which will be applied to docs in the specified indices
+     * @param mixed[]        $indices
+     */
+    public function __construct(AbstractFilter $filter, array $indices)
+    {
+        $this->setIndices($indices)->setFilter($filter);
+    }
+
+    /**
+     * Set the indices on which this filter should be applied.
+     *
+     * @param mixed[] $indices
+     *
+     * @return $this
+     */
+    public function setIndices(array $indices)
+    {
+        $this->setParam('indices', array());
+        foreach ($indices as $index) {
+            $this->addIndex($index);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds one more index on which this filter should be applied.
+     *
+     * @param string|\Elastica\Index $index
+     *
+     * @return $this
+     */
+    public function addIndex($index)
+    {
+        if ($index instanceof ElasticaIndex) {
+            $index = $index->getName();
+        }
+
+        return $this->addParam('indices', (string) $index);
+    }
+
+    /**
+     * Set the filter to be applied to docs in the specified indices.
+     *
+     * @param AbstractFilter $filter
+     *
+     * @return $this
+     */
+    public function setFilter(AbstractFilter $filter)
+    {
+        return $this->setParam('filter', $filter);
+    }
+
+    /**
+     * Set the filter to be applied to docs in indices which do not match those specified in the "indices" parameter.
+     *
+     * @param AbstractFilter $filter
+     *
+     * @return $this
+     */
+    public function setNoMatchFilter(AbstractFilter $filter)
+    {
+        return $this->setParam('no_match_filter', $filter);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Limit.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Limit.php
index e02853a..d0b5351 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Limit.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Limit.php
@@ -2,21 +2,22 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Limit Filter
+ * Limit Filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/limit-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-limit-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Limit extends AbstractFilter
 {
     /**
-     * Construct limit filter
+     * Construct limit filter.
      *
-     * @param  int                         $limit Limit
-     * @return \Elastica\Filter\Limit
+     * @param int $limit Limit
      */
     public function __construct($limit)
     {
@@ -24,10 +25,11 @@ public function __construct($limit)
     }
 
     /**
-     * Set the limit
+     * Set the limit.
+     *
+     * @param int $limit Limit
      *
-     * @param  int                         $limit Limit
-     * @return \Elastica\Filter\Limit
+     * @return $this
      */
     public function setLimit($limit)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/MatchAll.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/MatchAll.php
index a69b65a..8a8d4e7 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/MatchAll.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/MatchAll.php
@@ -2,18 +2,20 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Match all filter
+ * Match all filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/match-all-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-all-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class MatchAll extends AbstractFilter
 {
     /**
-     * Creates match all filter
+     * Creates match all filter.
      */
     public function __construct()
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Missing.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Missing.php
index df8466a..c0178bb 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Missing.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Missing.php
@@ -2,18 +2,20 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Missing Filter
+ * Missing Filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Maciej Wiercinski <maciej@wiercinski.net>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/missing-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-missing-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Missing extends AbstractFilter
 {
     /**
-     * Construct missing filter
+     * Construct missing filter.
      *
      * @param string $field OPTIONAL
      */
@@ -25,13 +27,38 @@ public function __construct($field = '')
     }
 
     /**
-     * Set field
+     * Set field.
+     *
+     * @param string $field
      *
-     * @param  string                        $field
-     * @return \Elastica\Filter\Missing
+     * @return $this
      */
     public function setField($field)
     {
         return $this->setParam('field', (string) $field);
     }
+
+    /**
+     * Set "existence" parameter.
+     *
+     * @param bool $existence
+     *
+     * @return $this
+     */
+    public function setExistence($existence)
+    {
+        return $this->setParam('existence', (bool) $existence);
+    }
+
+    /**
+     * Set "null_value" parameter.
+     *
+     * @param bool $nullValue
+     *
+     * @return $this
+     */
+    public function setNullValue($nullValue)
+    {
+        return $this->setParam('null_value', (bool) $nullValue);
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Nested.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Nested.php
index 1629351..2a786eb 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Nested.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Nested.php
@@ -4,21 +4,24 @@
 
 use Elastica\Query\AbstractQuery;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Nested filter
+ * Nested filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/nested-filter.html
+ *
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-nested-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Nested extends AbstractFilter
 {
     /**
-     * Adds field to mlt filter
+     * Adds field to mlt filter.
+     *
+     * @param string $path Nested object path
      *
-     * @param  string                       $path Nested object path
-     * @return \Elastica\Filter\Nested
+     * @return $this
      */
     public function setPath($path)
     {
@@ -26,35 +29,38 @@ public function setPath($path)
     }
 
     /**
-     * Sets nested query
+     * Sets nested query.
      *
-     * @param  \Elastica\Query\AbstractQuery $query
-     * @return \Elastica\Filter\Nested
+     * @param \Elastica\Query\AbstractQuery $query
+     *
+     * @return $this
      */
     public function setQuery(AbstractQuery $query)
     {
-        return $this->setParam('query', $query->toArray());
+        return $this->setParam('query', $query);
     }
 
     /**
-     * Sets nested filter
+     * Sets nested filter.
+     *
+     * @param \Elastica\Filter\AbstractFilter $filter
      *
-     * @param  \Elastica\Filter\AbstractFilter $filter
-     * @return \Elastica\Filter\Nested
+     * @return $this
      */
     public function setFilter(AbstractFilter $filter)
     {
-        return $this->setParam('filter', $filter->toArray());
+        return $this->setParam('filter', $filter);
     }
 
     /**
-     * Set score mode
+     * Set join option.
+     *
+     * @param bool $join
      *
-     * @param  string                       $scoreMode Options: avg, total, max and none.
-     * @return \Elastica\Filter\Nested
+     * @return $this
      */
-    public function setScoreMode($scoreMode)
+    public function setJoin($join)
     {
-        return $this->setParam('score_mode', $scoreMode);
+        return $this->setParam('join', (bool) $join);
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/NumericRange.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/NumericRange.php
index 5a6e255..beb64d4 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/NumericRange.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/NumericRange.php
@@ -2,13 +2,15 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Numeric Range Filter
+ * Numeric Range Filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/numeric-range-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class NumericRange extends Range
 {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Prefix.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Prefix.php
index 2caf13c..0572670 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Prefix.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Prefix.php
@@ -2,13 +2,15 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Prefix filter
+ * Prefix filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Jasper van Wanrooy <jasper@vanwanrooy.net>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/prefix-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-prefix-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Prefix extends AbstractFilter
 {
@@ -27,7 +29,7 @@ class Prefix extends AbstractFilter
     protected $_prefix = '';
 
     /**
-     * Creates prefix filter
+     * Creates prefix filter.
      *
      * @param string $field  Field name
      * @param string $prefix Prefix string
@@ -41,8 +43,9 @@ public function __construct($field = '', $prefix = '')
     /**
      * Sets the name of the prefix field.
      *
-     * @param  string                       $field Field name
-     * @return \Elastica\Filter\Prefix
+     * @param string $field Field name
+     *
+     * @return $this
      */
     public function setField($field)
     {
@@ -54,8 +57,9 @@ public function setField($field)
     /**
      * Sets the prefix string.
      *
-     * @param  string                       $prefix Prefix string
-     * @return \Elastica\Filter\Prefix
+     * @param string $prefix Prefix string
+     *
+     * @return $this
      */
     public function setPrefix($prefix)
     {
@@ -65,9 +69,10 @@ public function setPrefix($prefix)
     }
 
     /**
-     * Converts object to an array
+     * Converts object to an array.
      *
      * @see \Elastica\Filter\AbstractFilter::toArray()
+     *
      * @return array data array
      */
     public function toArray()
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Query.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Query.php
index 3f1ba2d..40b9e3d 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Query.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Query.php
@@ -5,24 +5,27 @@
 use Elastica\Exception\InvalidException;
 use Elastica\Query\AbstractQuery;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Query filter
+ * Query filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/query-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Query extends AbstractFilter
 {
     /**
-     * Query
+     * Query.
+     *
      * @var array
      */
     protected $_query;
 
     /**
-     * Construct query filter
+     * Construct query filter.
      *
      * @param array|\Elastica\Query\AbstractQuery $query
      */
@@ -34,22 +37,20 @@ public function __construct($query = null)
     }
 
     /**
-     * Set query
+     * Set query.
+     *
+     * @param array|\Elastica\Query\AbstractQuery $query
+     *
+     * @throws \Elastica\Exception\InvalidException If parameter is invalid
      *
-     * @param  array|\Elastica\Query\AbstractQuery  $query
-     * @return \Elastica\Filter\Query         Query object
-     * @throws \Elastica\Exception\InvalidException Invalid param
+     * @return $this
      */
     public function setQuery($query)
     {
-        if (!$query instanceof AbstractQuery && ! is_array($query)) {
+        if (!$query instanceof AbstractQuery && !is_array($query)) {
             throw new InvalidException('expected an array or instance of Elastica\Query\AbstractQuery');
         }
 
-        if ($query instanceof AbstractQuery) {
-            $query = $query->toArray();
-        }
-
         $this->_query = $query;
 
         return $this;
@@ -85,6 +86,6 @@ public function toArray()
 
         $data[$name] = $filterData;
 
-        return $data;
+        return $this->_convertArrayable($data);
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Range.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Range.php
index b142e67..aff385b 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Range.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Range.php
@@ -2,30 +2,32 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Range Filter
+ * Range Filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/range-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Range extends AbstractFilter
 {
     /**
-     * Fields
+     * Fields.
      *
      * @var array Fields
      */
     protected $_fields = array();
 
     /**
-     * Construct range filter
+     * Construct range filter.
      *
-     * @param string|bool $fieldName Field name
-     * @param array       $args      Field arguments
+     * @param string $fieldName Field name
+     * @param array  $args      Field arguments
      */
-    public function __construct($fieldName = false, array $args = array())
+    public function __construct($fieldName = '', array $args = array())
     {
         if ($fieldName) {
             $this->addField($fieldName, $args);
@@ -33,11 +35,12 @@ public function __construct($fieldName = false, array $args = array())
     }
 
     /**
-     * Ads a field with arguments to the range query
+     * Ads a field with arguments to the range query.
+     *
+     * @param string $fieldName Field name
+     * @param array  $args      Field arguments
      *
-     * @param  string                      $fieldName Field name
-     * @param  array                       $args      Field arguments
-     * @return \Elastica\Filter\Range
+     * @return $this
      */
     public function addField($fieldName, array $args)
     {
@@ -47,14 +50,27 @@ public function addField($fieldName, array $args)
     }
 
     /**
-     * Converts object to array
+     * Set execution mode.
+     *
+     * @param string $execution Options: "index" or "fielddata"
+     *
+     * @return $this
+     */
+    public function setExecution($execution)
+    {
+        return $this->setParam('execution', (string) $execution);
+    }
+
+    /**
+     * Converts object to array.
      *
      * @see \Elastica\Filter\AbstractFilter::toArray()
+     *
      * @return array Filter array
      */
     public function toArray()
     {
-        $this->setParams($this->_fields);
+        $this->setParams(array_merge($this->getParams(), $this->_fields));
 
         return parent::toArray();
     }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Regexp.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Regexp.php
index 33c47cf..12e232a 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Regexp.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Regexp.php
@@ -2,13 +2,15 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Regexp filter
+ * Regexp filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Timothy Lamb <trash80@gmail.com>
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-regexp-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Regexp extends AbstractFilter
 {
@@ -27,23 +29,34 @@ class Regexp extends AbstractFilter
     protected $_regexp = '';
 
     /**
-     * Create Regexp object
+     * Holds the regexp options.
+     *
+     * @var array
+     */
+    protected $_options = array();
+
+    /**
+     * Create Regexp object.
+     *
+     * @param string $field   Field name
+     * @param string $regexp  Regular expression
+     * @param array  $options Regular expression options
      *
-     * @param  string $field    Field name
-     * @param  string $regexp   Regular expression
      * @throws \Elastica\Exception\InvalidException
      */
-    public function __construct($field = '', $regexp = '')
+    public function __construct($field = '', $regexp = '', $options = array())
     {
         $this->setField($field);
         $this->setRegexp($regexp);
+        $this->setOptions($options);
     }
 
     /**
      * Sets the name of the regexp field.
      *
-     * @param  string                       $field Field name
-     * @return \Elastica\Filter\Regexp
+     * @param string $field Field name
+     *
+     * @return $this
      */
     public function setField($field)
     {
@@ -55,8 +68,9 @@ public function setField($field)
     /**
      * Sets the regular expression query string.
      *
-     * @param  string                       $regexp Regular expression
-     * @return \Elastica\Filter\Regexp
+     * @param string $regexp Regular expression
+     *
+     * @return $this
      */
     public function setRegexp($regexp)
     {
@@ -66,14 +80,36 @@ public function setRegexp($regexp)
     }
 
     /**
-     * Converts object to an array
+     * Sets the regular expression query options.
+     *
+     * @param array $options Regular expression options
+     *
+     * @return $this
+     */
+    public function setOptions($options)
+    {
+        $this->_options = $options;
+
+        return $this;
+    }
+
+    /**
+     * Converts object to an array.
      *
      * @see \Elastica\Filter\AbstractFilter::toArray()
+     *
      * @return array data array
      */
     public function toArray()
     {
-        $this->setParam($this->_field, $this->_regexp);
+        if (count($this->_options) > 0) {
+            $options = array('value' => $this->_regexp);
+            $options = array_merge($options, $this->_options);
+
+            $this->setParam($this->_field, $options);
+        } else {
+            $this->setParam($this->_field, $this->_regexp);
+        }
 
         return parent::toArray();
     }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Script.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Script.php
index 9b34b1e..6b0110e 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Script.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Script.php
@@ -3,29 +3,30 @@
 namespace Elastica\Filter;
 
 use Elastica;
-use Elastica\Query\AbstractQuery;
+
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
 
 /**
- * Script filter
+ * Script filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/script-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-script-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Script extends AbstractFilter
 {
     /**
-     * Query object
+     * Query object.
      *
      * @var array|\Elastica\Query\AbstractQuery
      */
     protected $_query = null;
 
     /**
-     * Construct script filter
+     * Construct script filter.
      *
-     * @param array|string|\Elastica\Script $script OPTIONAL Script
+     * @param array|string|\Elastica\Script\AbstractScript $script OPTIONAL Script
      */
     public function __construct($script = null)
     {
@@ -35,15 +36,28 @@ public function __construct($script = null)
     }
 
     /**
-     * Sets script object
+     * Sets script object.
+     *
+     * @param \Elastica\Script\Script|string|array $script
      *
-     * @param  \Elastica\Script|string|array $script
-     * @return \Elastica\Filter\Script
+     * @return $this
      */
     public function setScript($script)
     {
-        $script = Elastica\Script::create($script);
+        return $this->setParam('script', Elastica\Script\Script::create($script));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        if (isset($array['script'])) {
+            $array['script'] = $array['script']['script'];
+        }
 
-        return $this->setParams($script->toArray());
+        return $array;
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Term.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Term.php
index b477303..82723dd 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Term.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Term.php
@@ -2,18 +2,20 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Term query
+ * Term query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/term-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Term extends AbstractFilter
 {
     /**
-     * Construct term filter
+     * Construct term filter.
      *
      * @param array $term Term array
      */
@@ -23,10 +25,11 @@ public function __construct(array $term = array())
     }
 
     /**
-     * Sets/overwrites key and term directly
+     * Sets/overwrites key and term directly.
      *
-     * @param  array                      $term Key value pair
-     * @return \Elastica\Filter\Term Filter object
+     * @param array $term Key value pair
+     *
+     * @return $this
      */
     public function setRawTerm(array $term)
     {
@@ -34,11 +37,12 @@ public function setRawTerm(array $term)
     }
 
     /**
-     * Adds a term to the term query
+     * Adds a term to the term query.
+     *
+     * @param string       $key   Key to query
+     * @param string|array $value Values(s) for the query. Boost can be set with array
      *
-     * @param  string                     $key   Key to query
-     * @param  string|array               $value Values(s) for the query. Boost can be set with array
-     * @return \Elastica\Filter\Term Filter object
+     * @return $this
      */
     public function setTerm($key, $value)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Terms.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Terms.php
index be19aa7..80286c9 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Terms.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Terms.php
@@ -4,39 +4,41 @@
 
 use Elastica\Exception\InvalidException;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Terms filter
+ * Terms filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/terms-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Terms extends AbstractFilter
 {
     /**
-     * Terms
+     * Terms.
      *
      * @var array Terms
      */
     protected $_terms = array();
 
     /**
-     * Params
+     * Params.
      *
      * @var array Params
      */
     protected $_params = array();
 
     /**
-     * Terms key
+     * Terms key.
      *
      * @var string Terms key
      */
     protected $_key = '';
 
     /**
-     * Creates terms filter
+     * Creates terms filter.
      *
      * @param string $key   Terms key
      * @param array  $terms Terms values
@@ -47,11 +49,12 @@ public function __construct($key = '', array $terms = array())
     }
 
     /**
-     * Sets key and terms for the filter
+     * Sets key and terms for the filter.
+     *
+     * @param string $key   Terms key
+     * @param array  $terms Terms for the query.
      *
-     * @param  string                      $key   Terms key
-     * @param  array                       $terms Terms for the query.
-     * @return \Elastica\Filter\Terms
+     * @return $this
      */
     public function setTerms($key, array $terms)
     {
@@ -62,15 +65,17 @@ public function setTerms($key, array $terms)
     }
 
     /**
-     * Set the lookup parameters for this filter
-     * @param string $key terms key
-     * @param string|\Elastica\Type $type document type from which to fetch the terms values
-     * @param string $id id of the document from which to fetch the terms values
-     * @param string $path the field from which to fetch the values for the filter
-     * @param string|\Elastica\Index $index the index from which to fetch the terms values. Defaults to the current index.
-     * @return \Elastica\Filter\Terms Filter object
+     * Set the lookup parameters for this filter.
+     *
+     * @param string                       $key     terms key
+     * @param string|\Elastica\Type        $type    document type from which to fetch the terms values
+     * @param string                       $id      id of the document from which to fetch the terms values
+     * @param string                       $path    the field from which to fetch the values for the filter
+     * @param string|array|\Elastica\Index $options An array of options or the index from which to fetch the terms values. Defaults to the current index.
+     *
+     * @return $this
      */
-    public function setLookup($key, $type, $id, $path, $index = NULL)
+    public function setLookup($key, $type, $id, $path, $options = array())
     {
         $this->_key = $key;
         if ($type instanceof \Elastica\Type) {
@@ -79,22 +84,34 @@ public function setLookup($key, $type, $id, $path, $index = NULL)
         $this->_terms = array(
             'type' => $type,
             'id' => $id,
-            'path' => $path
+            'path' => $path,
         );
+
+        $index = $options;
+        if (is_array($options)) {
+            if (isset($options['index'])) {
+                $index = $options['index'];
+                unset($options['index']);
+            }
+            $this->_terms = array_merge($options, $this->_terms);
+        }
+
         if (!is_null($index)) {
             if ($index instanceof \Elastica\Index) {
                 $index = $index->getName();
             }
             $this->_terms['index'] = $index;
         }
+
         return $this;
     }
 
     /**
-     * Adds an additional term to the query
+     * Adds an additional term to the query.
      *
-     * @param  string                      $term Filter term
-     * @return \Elastica\Filter\Terms Filter object
+     * @param string $term Filter term
+     *
+     * @return $this
      */
     public function addTerm($term)
     {
@@ -104,11 +121,13 @@ public function addTerm($term)
     }
 
     /**
-     * Converts object to an array
+     * Converts object to an array.
      *
      * @see \Elastica\Filter\AbstractFilter::toArray()
+     *
      * @throws \Elastica\Exception\InvalidException
-     * @return array                               data array
+     *
+     * @return array
      */
     public function toArray()
     {
@@ -119,4 +138,16 @@ public function toArray()
 
         return array('terms' => $this->_params);
     }
+
+    /**
+     * Set execution mode.
+     *
+     * @param string $execution Options: "bool", "and", "or", "plain" or "fielddata"
+     *
+     * @return $this
+     */
+    public function setExecution($execution)
+    {
+        return $this->setParam('execution', (string) $execution);
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Type.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Type.php
index 8fb58c7..b623652 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Type.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Filter/Type.php
@@ -2,41 +2,43 @@
 
 namespace Elastica\Filter;
 
+trigger_error('Deprecated: Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html', E_USER_DEPRECATED);
+
 /**
- * Type Filter
+ * Type Filter.
  *
- * @category Xodoa
- * @package Elastica
  * @author James Wilson <jwilson556@gmail.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/type-filter.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-type-filter.html
+ * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Type extends AbstractFilter
 {
     /**
-     * Type name
+     * Type name.
      *
      * @var string
      */
     protected $_type = null;
 
     /**
-     * Construct Type Filter
+     * Construct Type Filter.
      *
-     * @param  string                     $typeName Type name
-     * @return \Elastica\Filter\Type
+     * @param string $type Type name
      */
-    public function __construct($typeName = null)
+    public function __construct($type = null)
     {
-        if ($typeName) {
-            $this->setType($typeName);
+        if ($type) {
+            $this->setType($type);
         }
     }
 
     /**
-     * Ads a field with arguments to the range query
+     * Ads a field with arguments to the range query.
      *
-     * @param  string                     $typeName Type name
-     * @return \Elastica\Filter\Type current object
+     * @param string $typeName Type name
+     *
+     * @return $this
      */
     public function setType($typeName)
     {
@@ -46,15 +48,16 @@ public function setType($typeName)
     }
 
     /**
-     * Convert object to array
+     * Convert object to array.
      *
      * @see \Elastica\Filter\AbstractFilter::toArray()
+     *
      * @return array Filter array
      */
     public function toArray()
     {
         return array(
-            'type' => array('value' => $this->_type)
+            'type' => array('value' => $this->_type),
         );
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index.php
index a776533..e9c0eca 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index.php
@@ -6,56 +6,54 @@
 use Elastica\Exception\ResponseException;
 use Elastica\Index\Settings as IndexSettings;
 use Elastica\Index\Stats as IndexStats;
-use Elastica\Index\Status as IndexStatus;
+use Elastica\ResultSet\BuilderInterface;
 
 /**
- * Elastica index object
+ * Elastica index object.
  *
  * Handles reads, deletes and configurations of an index
  *
- * @category Xodoa
- * @package  Elastica
  * @author   Nicolas Ruflin <spam@ruflin.com>
  */
 class Index implements SearchableInterface
 {
     /**
-     * Index name
+     * Index name.
      *
      * @var string Index name
      */
     protected $_name = '';
 
     /**
-     * Client object
+     * Client object.
      *
      * @var \Elastica\Client Client object
      */
     protected $_client = null;
 
     /**
-     * Creates a new index object
+     * Creates a new index object.
      *
      * All the communication to and from an index goes of this object
      *
-     * @param  \Elastica\Client $client Client object
-     * @param  string           $name   Index name
-     * @throws \Elastica\Exception\InvalidException
+     * @param \Elastica\Client $client Client object
+     * @param string $name Index name
      */
     public function __construct(Client $client, $name)
     {
         $this->_client = $client;
 
-        if (!is_string($name)) {
-            throw new InvalidException('Index name should be of type string');
+        if (!is_scalar($name)) {
+            throw new InvalidException('Index name should be a scalar type');
         }
-        $this->_name = $name;
+        $this->_name = (string) $name;
     }
 
     /**
-     * Returns a type object for the current index with the given name
+     * Returns a type object for the current index with the given name.
+     *
+     * @param string $type Type name
      *
-     * @param  string        $type Type name
      * @return \Elastica\Type Type object
      */
     public function getType($type)
@@ -64,17 +62,7 @@ public function getType($type)
     }
 
     /**
-     * Returns the current status of the index
-     *
-     * @return \Elastica\Index\Status Index status
-     */
-    public function getStatus()
-    {
-        return new IndexStatus($this);
-    }
-
-    /**
-     * Return Index Stats
+     * Return Index Stats.
      *
      * @return \Elastica\Index\Stats
      */
@@ -93,12 +81,20 @@ public function getMapping()
         $path = '_mapping';
 
         $response = $this->request($path, Request::GET);
+        $data = $response->getData();
+
+        // Get first entry as if index is an Alias, the name of the mapping is the real name and not alias name
+        $mapping = array_shift($data);
+
+        if (isset($mapping['mappings'])) {
+            return $mapping['mappings'];
+        }
 
-        return $response->getData();
+        return array();
     }
 
     /**
-     * Returns the index settings object
+     * Returns the index settings object.
      *
      * @return \Elastica\Index\Settings Settings object
      */
@@ -108,11 +104,31 @@ public function getSettings()
     }
 
     /**
-     * Uses _bulk to send documents to the server
+     * Uses _bulk to send documents to the server.
+     *
+     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
      *
-     * @param  array|\Elastica\Document[] $docs Array of Elastica\Document
      * @return \Elastica\Bulk\ResponseSet
-     * @link http://www.elasticsearch.org/guide/reference/api/bulk.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
+     */
+    public function updateDocuments(array $docs)
+    {
+        foreach ($docs as $doc) {
+            $doc->setIndex($this->getName());
+        }
+
+        return $this->getClient()->updateDocuments($docs);
+    }
+
+    /**
+     * Uses _bulk to send documents to the server.
+     *
+     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     *
+     * @return \Elastica\Bulk\ResponseSet
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
      */
     public function addDocuments(array $docs)
     {
@@ -124,7 +140,30 @@ public function addDocuments(array $docs)
     }
 
     /**
-     * Deletes the index
+     * Deletes entries in the db based on a query.
+     *
+     * @param \Elastica\Query|string|array $query   Query object or array
+     * @param array                        $options Optional params
+     *
+     * @return \Elastica\Response
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html
+     */
+    public function deleteByQuery($query, array $options = array())
+    {
+        if (is_string($query)) {
+            // query_string queries are not supported for delete by query operations
+            $options['q'] = $query;
+
+            return $this->request('_query', Request::DELETE, array(), $options);
+        }
+        $query = Query::create($query)->getQuery();
+
+        return $this->request('_query', Request::DELETE, array('query' => is_array($query) ? $query : $query->toArray()), $options);
+    }
+
+    /**
+     * Deletes the index.
      *
      * @return \Elastica\Response Response object
      */
@@ -136,25 +175,45 @@ public function delete()
     }
 
     /**
-     * Optimizes search index
+     * Uses _bulk to delete documents from the server.
+     *
+     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     *
+     * @return \Elastica\Bulk\ResponseSet
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
+     */
+    public function deleteDocuments(array $docs)
+    {
+        foreach ($docs as $doc) {
+            $doc->setIndex($this->getName());
+        }
+
+        return $this->getClient()->deleteDocuments($docs);
+    }
+
+    /**
+     * Optimizes search index.
      *
      * Detailed arguments can be found here in the link
      *
-     * @param  array $args OPTIONAL Additional arguments
+     * @param array $args OPTIONAL Additional arguments
+     *
      * @return array Server response
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-optimize.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-optimize.html
      */
     public function optimize($args = array())
     {
-        // TODO: doesn't seem to work?
-        $this->request('_optimize', Request::POST, $args);
+        return $this->request('_optimize', Request::POST, array(), $args);
     }
 
     /**
-     * Refreshes the index
+     * Refreshes the index.
      *
      * @return \Elastica\Response Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-refresh.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-refresh.html
      */
     public function refresh()
     {
@@ -162,16 +221,19 @@ public function refresh()
     }
 
     /**
-     * Creates a new index with the given arguments
+     * Creates a new index with the given arguments.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html
      *
      * @param array      $args    OPTIONAL Arguments to use
      * @param bool|array $options OPTIONAL
      *                            bool=> Deletes index first if already exists (default = false).
      *                            array => Associative array of options (option=>value)
+     *
      * @throws \Elastica\Exception\InvalidException
      * @throws \Elastica\Exception\ResponseException
-     * @return array                                Server response
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-create-index.html
+     *
+     * @return array Server response
      */
     public function create(array $args = array(), $options = null)
     {
@@ -201,7 +263,7 @@ public function create(array $args = array(), $options = null)
                             $query = array('routing' => $value);
                             break;
                         default:
-                            throw new InvalidException('Invalid option ' . $key);
+                            throw new InvalidException('Invalid option '.$key);
                             break;
                     }
                 }
@@ -212,7 +274,7 @@ public function create(array $args = array(), $options = null)
     }
 
     /**
-     * Checks if the given index is already created
+     * Checks if the given index is already created.
      *
      * @return bool True if index exists
      */
@@ -225,13 +287,15 @@ public function exists()
     }
 
     /**
-     * @param  string          $query
-     * @param  int|array       $options
-     * @return \Elastica\Search
+     * @param string|array|\Elastica\Query $query
+     * @param int|array $options
+     * @param BuilderInterface $builder
+     *
+     * @return Search
      */
-    public function createSearch($query = '', $options = null)
+    public function createSearch($query = '', $options = null, BuilderInterface $builder = null)
     {
-        $search = new Search($this->getClient());
+        $search = new Search($this->getClient(), $builder);
         $search->addIndex($this);
         $search->setOptionsAndQuery($options, $query);
 
@@ -239,11 +303,13 @@ public function createSearch($query = '', $options = null)
     }
 
     /**
-     * Searches in this index
+     * Searches in this index.
+     *
+     * @param string|array|\Elastica\Query $query   Array with all query data inside or a Elastica\Query object
+     * @param int|array                    $options OPTIONAL Limit or associative array of options (option=>value)
+     *
+     * @return \Elastica\ResultSet with all results inside
      *
-     * @param  string|array|\Elastica\Query $query   Array with all query data inside or a Elastica\Query object
-     * @param  int|array                   $options OPTIONAL Limit or associative array of options (option=>value)
-     * @return \Elastica\ResultSet          ResultSet with all results inside
      * @see \Elastica\SearchableInterface::search
      */
     public function search($query = '', $options = null)
@@ -254,10 +320,12 @@ public function search($query = '', $options = null)
     }
 
     /**
-     * Counts results of query
+     * Counts results of query.
+     *
+     * @param string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
+     *
+     * @return int number of documents matching the query
      *
-     * @param  string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
-     * @return int                         number of documents matching the query
      * @see \Elastica\SearchableInterface::count
      */
     public function count($query = '')
@@ -268,21 +336,23 @@ public function count($query = '')
     }
 
     /**
-     * Opens an index
+     * Opens an index.
      *
      * @return \Elastica\Response Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-open-close.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-open-close.html
      */
     public function open()
     {
-        $this->request('_open', Request::POST);
+        return $this->request('_open', Request::POST);
     }
 
     /**
-     * Closes the index
+     * Closes the index.
      *
      * @return \Elastica\Response Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-open-close.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-open-close.html
      */
     public function close()
     {
@@ -290,7 +360,7 @@ public function close()
     }
 
     /**
-     * Returns the index name
+     * Returns the index name.
      *
      * @return string Index name
      */
@@ -300,7 +370,7 @@ public function getName()
     }
 
     /**
-     * Returns index client
+     * Returns index client.
      *
      * @return \Elastica\Client Index client object
      */
@@ -310,22 +380,24 @@ public function getClient()
     }
 
     /**
-     * Adds an alias to the current index
+     * Adds an alias to the current index.
+     *
+     * @param string $name    Alias name
+     * @param bool   $replace OPTIONAL If set, an existing alias will be replaced
      *
-     * @param  string            $name    Alias name
-     * @param  bool              $replace OPTIONAL If set, an existing alias will be replaced
      * @return \Elastica\Response Response
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-aliases.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html
      */
     public function addAlias($name, $replace = false)
     {
         $path = '_aliases';
 
-        $data = array( 'actions' => array( ) );
+        $data = array('actions' => array());
 
         if ($replace) {
-            $status = new Status( $this->getClient() );
-            foreach ( $status->getIndicesWithAlias( $name ) as $index ) {
+            $status = new Status($this->getClient());
+            foreach ($status->getIndicesWithAlias($name) as $index) {
                 $data['actions'][] = array('remove' => array('index' => $index->getName(), 'alias' => $name));
             }
         }
@@ -336,11 +408,13 @@ public function addAlias($name, $replace = false)
     }
 
     /**
-     * Removes an alias pointing to the current index
+     * Removes an alias pointing to the current index.
+     *
+     * @param string $name Alias name
      *
-     * @param  string            $name Alias name
      * @return \Elastica\Response Response
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-aliases.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html
      */
     public function removeAlias($name)
     {
@@ -352,10 +426,44 @@ public function removeAlias($name)
     }
 
     /**
-     * Clears the cache of an index
+     * Returns all index aliases.
+     *
+     * @return array Aliases
+     */
+    public function getAliases()
+    {
+        $responseData = $this->request('_alias/*', \Elastica\Request::GET)->getData();
+
+        if (!isset($responseData[$this->getName()])) {
+            return array();
+        }
+
+        $data = $responseData[$this->getName()];
+        if (!empty($data['aliases'])) {
+            return array_keys($data['aliases']);
+        }
+
+        return array();
+    }
+
+    /**
+     * Checks if the index has the given alias.
+     *
+     * @param string $name Alias name
+     *
+     * @return bool
+     */
+    public function hasAlias($name)
+    {
+        return in_array($name, $this->getAliases());
+    }
+
+    /**
+     * Clears the cache of an index.
      *
      * @return \Elastica\Response Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-clearcache.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-clearcache.html
      */
     public function clearCache()
     {
@@ -365,24 +473,29 @@ public function clearCache()
     }
 
     /**
-     * Flushes the index to storage
+     * Flushes the index to storage.
      *
-     * @return \Elastica\Response Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-flush.html
+     * @param bool $refresh
+     *
+     * @return Response Response object
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-flush.html
      */
     public function flush($refresh = false)
     {
         $path = '_flush';
+
         return $this->request($path, Request::POST, array(), array('refresh' => $refresh));
     }
 
     /**
-     * Can be used to change settings during runtime. One example is to use
-     * if for bulk updating {@link http://www.elasticsearch.org/blog/2011/03/23/update-settings.html}
+     * Can be used to change settings during runtime. One example is to use it for bulk updating.
+     *
+     * @param array $data Data array
      *
-     * @param  array             $data Data array
      * @return \Elastica\Response Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-update-settings.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
      */
     public function setSettings(array $data)
     {
@@ -390,18 +503,38 @@ public function setSettings(array $data)
     }
 
     /**
-     * Makes calls to the elasticsearch server based on this index
+     * Makes calls to the elasticsearch server based on this index.
+     *
+     * @param string $path   Path to call
+     * @param string $method Rest method to use (GET, POST, DELETE, PUT)
+     * @param array  $data   OPTIONAL Arguments as array
+     * @param array  $query  OPTIONAL Query params
      *
-     * @param  string            $path   Path to call
-     * @param  string            $method Rest method to use (GET, POST, DELETE, PUT)
-     * @param  array             $data   OPTIONAL Arguments as array
-     * @param  array             $query  OPTIONAL Query params
      * @return \Elastica\Response Response object
      */
     public function request($path, $method, $data = array(), array $query = array())
     {
-        $path = $this->getName() . '/' . $path;
+        $path = $this->getName().'/'.$path;
 
         return $this->getClient()->request($path, $method, $data, $query);
     }
+
+    /**
+     * Analyzes a string.
+     *
+     * Detailed arguments can be found here in the link
+     *
+     * @param string $text String to be analyzed
+     * @param array  $args OPTIONAL Additional arguments
+     *
+     * @return array Server response
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-analyze.html
+     */
+    public function analyze($text, $args = array())
+    {
+        $data = $this->request('_analyze', Request::POST, $text, $args)->getData();
+
+        return $data['tokens'];
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index/Settings.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index/Settings.php
index 3678ad1..d6e573e 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index/Settings.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index/Settings.php
@@ -1,40 +1,42 @@
 <?php
 
 namespace Elastica\Index;
+
+use Elastica\Exception\NotFoundException;
+use Elastica\Exception\ResponseException;
 use Elastica\Index as BaseIndex;
 use Elastica\Request;
 
 /**
- * Elastica index settings object
+ * Elastica index settings object.
  *
- * All settings listed in the update settings API (http://www.elasticsearch.org/guide/reference/api/admin-indices-update-settings.html)
- * can be changed on a running indices. To make changes like the merge policy (http://www.elasticsearch.org/guide/reference/index-modules/merge.html)
+ * All settings listed in the update settings API (https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html)
+ * can be changed on a running indices. To make changes like the merge policy (https://www.elastic.co/guide/en/elasticsearch/reference/current/index-modules-merge.html)
  * the index has to be closed first and reopened after the call
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-update-settings.html
- * @link http://www.elasticsearch.org/guide/reference/index-modules/merge.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/index-modules-merge.html
  */
 class Settings
 {
     /**
-     * Response
+     * Response.
      *
      * @var \Elastica\Response Response object
      */
     protected $_response = null;
 
     /**
-     * Stats info
+     * Stats info.
      *
      * @var array Stats info
      */
     protected $_data = array();
 
     /**
-     * Index
+     * Index.
      *
      * @var \Elastica\Index Index object
      */
@@ -43,7 +45,7 @@ class Settings
     const DEFAULT_REFRESH_INTERVAL = '1s';
 
     /**
-     * Construct
+     * Construct.
      *
      * @param \Elastica\Index $index Index object
      */
@@ -53,35 +55,59 @@ public function __construct(BaseIndex $index)
     }
 
     /**
-     * Returns the current settings of the index
+     * Returns the current settings of the index.
      *
      * If param is set, only specified setting is return.
      * 'index.' is added in front of $setting.
      *
-     * @param  string            $setting OPTIONAL Setting name to return
+     * @param string $setting OPTIONAL Setting name to return
+     *
      * @return array|string|null Settings data
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-update-settings.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
      */
     public function get($setting = '')
     {
-        $data = $this->request()->getData();
-        $settings = $data[$this->_index->getName()]['settings'];
+        $requestData = $this->request()->getData();
+        $data = reset($requestData);
 
-        if (!empty($setting)) {
-            if (isset($settings['index.' . $setting])) {
-                return $settings['index.' . $setting];
-            } else {
-                return null;
-            }
+        if (empty($data['settings']) || empty($data['settings']['index'])) {
+            // should not append, the request should throw a ResponseException
+            throw new NotFoundException('Index '.$this->getIndex()->getName().' not found');
+        }
+        $settings = $data['settings']['index'];
+
+        if (!$setting) {
+            // return all array
+            return $settings;
         }
 
-        return $settings;
+        if (isset($settings[$setting])) {
+            return $settings[$setting];
+        } else {
+            if (strpos($setting, '.') !== false) {
+                // translate old dot-notation settings to nested arrays
+                $keys = explode('.', $setting);
+                foreach ($keys as $key) {
+                    if (isset($settings[$key])) {
+                        $settings = $settings[$key];
+                    } else {
+                        return;
+                    }
+                }
+
+                return $settings;
+            }
+
+            return;
+        }
     }
 
     /**
-     * Sets the number of replicas
+     * Sets the number of replicas.
+     *
+     * @param int $replicas Number of replicas
      *
-     * @param  int               $replicas Number of replicas
      * @return \Elastica\Response Response object
      */
     public function setNumberOfReplicas($replicas)
@@ -94,14 +120,25 @@ public function setNumberOfReplicas($replicas)
     }
 
     /**
-     * Sets the index to read only
+     * Sets the index to read only.
+     *
+     * @param bool $readOnly (default = true)
      *
-     * @param  bool              $readOnly (default = true)
      * @return \Elastica\Response
      */
     public function setReadOnly($readOnly = true)
     {
-        return $this->set(array('blocks.read_only' => $readOnly));
+        return $this->set(array('blocks.write' => $readOnly));
+    }
+
+    /**
+     * getReadOnly.
+     *
+     * @return bool
+     */
+    public function getReadOnly()
+    {
+        return $this->get('blocks.write') === 'true'; // ES returns a string for this setting
     }
 
     /**
@@ -113,7 +150,8 @@ public function getBlocksRead()
     }
 
     /**
-     * @param  bool              $state OPTIONAL (default = true)
+     * @param bool $state OPTIONAL (default = true)
+     *
      * @return \Elastica\Response
      */
     public function setBlocksRead($state = true)
@@ -132,14 +170,15 @@ public function getBlocksWrite()
     }
 
     /**
-     * @param  bool              $state OPTIONAL (default = true)
+     * @param bool $state OPTIONAL (default = true)
+     *
      * @return \Elastica\Response
      */
     public function setBlocksWrite($state = true)
     {
         $state = $state ? 1 : 0;
 
-        return $this->set(array('blocks.write' => (int) $state));
+        return $this->set(array('blocks.write' => $state));
     }
 
     /**
@@ -147,27 +186,40 @@ public function setBlocksWrite($state = true)
      */
     public function getBlocksMetadata()
     {
-        return (bool) $this->get('blocks.metadata');
+        // TODO will have to be replace by block.metadata.write once https://github.com/elasticsearch/elasticsearch/pull/9203 has been fixed
+        // the try/catch will have to be remove too
+        try {
+            return (bool) $this->get('blocks.write');
+        } catch (ResponseException $e) {
+            if (strpos($e->getMessage(), 'ClusterBlockException') !== false) {
+                // hacky way to test if the metadata is blocked since bug 9203 is not fixed
+                return true;
+            } else {
+                throw $e;
+            }
+        }
     }
 
     /**
-     * @param  bool              $state OPTIONAL (default = true)
+     * @param bool $state OPTIONAL (default = true)
+     *
      * @return \Elastica\Response
      */
     public function setBlocksMetadata($state = true)
     {
         $state = $state ? 1 : 0;
 
-        return $this->set(array('blocks.metadata' => (int) $state));
+        return $this->set(array('blocks.write' => $state));
     }
 
     /**
-     * Sets the index refresh interval
+     * Sets the index refresh interval.
      *
      * Value can be for example 3s for 3 seconds or
      * 5m for 5 minutes. -1 refreshing is disabled.
      *
-     * @param  int               $interval Number of seconds
+     * @param int $interval Number of milliseconds
+     *
      * @return \Elastica\Response Response object
      */
     public function setRefreshInterval($interval)
@@ -176,7 +228,7 @@ public function setRefreshInterval($interval)
     }
 
     /**
-     * Returns the refresh interval
+     * Returns the refresh interval.
      *
      * If no interval is set, the default interval is returned
      *
@@ -194,7 +246,7 @@ public function getRefreshInterval()
     }
 
     /**
-     * Return merge policy
+     * Return merge policy.
      *
      * @return string Merge policy type
      */
@@ -204,11 +256,13 @@ public function getMergePolicyType()
     }
 
     /**
-     * Sets merge policy
+     * Sets merge policy.
+     *
+     * @param string $type Merge policy type
      *
-     * @param  string            $type Merge policy type
      * @return \Elastica\Response Response object
-     * @link http://www.elasticsearch.org/guide/reference/index-modules/merge.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/index-modules-merge.html
      */
     public function setMergePolicyType($type)
     {
@@ -220,40 +274,50 @@ public function setMergePolicyType($type)
     }
 
     /**
-     * Sets the specific merge policies
+     * Sets the specific merge policies.
      *
      * To have this changes made the index has to be closed and reopened
      *
-     * @param  string            $key   Merge policy key (for ex. expunge_deletes_allowed)
-     * @param  string            $value
+     * @param string $key   Merge policy key (for ex. expunge_deletes_allowed)
+     * @param string $value
+     *
      * @return \Elastica\Response
-     * @link http://www.elasticsearch.org/guide/reference/index-modules/merge.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/index-modules-merge.html
      */
     public function setMergePolicy($key, $value)
     {
         $this->getIndex()->close();
-        $response = $this->set(array('merge.policy.' . $key => $value));
+        $response = $this->set(array('merge.policy.'.$key => $value));
         $this->getIndex()->open();
 
         return $response;
     }
 
     /**
-     * Returns the specific merge policy value
+     * Returns the specific merge policy value.
+     *
+     * @param string $key Merge policy key (for ex. expunge_deletes_allowed)
      *
-     * @param  string $key Merge policy key (for ex. expunge_deletes_allowed)
      * @return string Refresh interval
-     * @link http://www.elasticsearch.org/guide/reference/index-modules/merge.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/index-modules-merge.html
      */
     public function getMergePolicy($key)
     {
-        return $this->get('merge.policy.' . $key);
+        $settings = $this->get();
+        if (isset($settings['merge']['policy'][$key])) {
+            return $settings['merge']['policy'][$key];
+        }
+
+        return;
     }
 
     /**
-     * Can be used to set/update settings
+     * Can be used to set/update settings.
+     *
+     * @param array $data Arguments
      *
-     * @param  array             $data Arguments
      * @return \Elastica\Response Response object
      */
     public function set(array $data)
@@ -262,7 +326,7 @@ public function set(array $data)
     }
 
     /**
-     * Returns the index object
+     * Returns the index object.
      *
      * @return \Elastica\Index Index object
      */
@@ -272,7 +336,7 @@ public function getIndex()
     }
 
     /**
-     * Updates the given settings for the index
+     * Updates the given settings for the index.
      *
      * With elasticsearch 0.16 the following settings are supported
      * - index.term_index_interval
@@ -284,15 +348,18 @@ public function getIndex()
      * - index.merge.policy
      * - index.auto_expand_replicas
      *
-     * @param  array             $data   OPTIONAL Data array
-     * @param  string            $method OPTIONAL Transfer method (default = \Elastica\Request::GET)
+     * @param array  $data   OPTIONAL Data array
+     * @param string $method OPTIONAL Transfer method (default = \Elastica\Request::GET)
+     *
      * @return \Elastica\Response Response object
      */
     public function request(array $data = array(), $method = Request::GET)
     {
         $path = '_settings';
 
-        $data = array('index' => $data);
+        if (!empty($data)) {
+            $data = array('index' => $data);
+        }
 
         return $this->getIndex()->request($path, $method, $data);
     }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index/Stats.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index/Stats.php
index 9312e27..661d78f 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index/Stats.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Index/Stats.php
@@ -1,42 +1,42 @@
 <?php
 
 namespace Elastica\Index;
+
 use Elastica\Index as BaseIndex;
 use Elastica\Request;
 
 /**
- * Elastica index stats object
+ * Elastica index stats object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-stats.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-stats.html
  */
 class Stats
 {
     /**
-     * Response
+     * Response.
      *
      * @var \Elastica\Response Response object
      */
     protected $_response = null;
 
     /**
-     * Stats info
+     * Stats info.
      *
      * @var array Stats info
      */
     protected $_data = array();
 
     /**
-     * Index
+     * Index.
      *
      * @var \Elastica\Index Index object
      */
     protected $_index = null;
 
     /**
-     * Construct
+     * Construct.
      *
      * @param \Elastica\Index $index Index object
      */
@@ -47,7 +47,7 @@ public function __construct(BaseIndex $index)
     }
 
     /**
-     * Returns the raw stats info
+     * Returns the raw stats info.
      *
      * @return array Stats info
      */
@@ -70,7 +70,7 @@ public function get()
             if (isset($data[$arg])) {
                 $data = $data[$arg];
             } else {
-                return null;
+                return;
             }
         }
 
@@ -78,7 +78,7 @@ public function get()
     }
 
     /**
-     * Returns the index object
+     * Returns the index object.
      *
      * @return \Elastica\Index Index object
      */
@@ -88,7 +88,7 @@ public function getIndex()
     }
 
     /**
-     * Returns response object
+     * Returns response object.
      *
      * @return \Elastica\Response Response object
      */
@@ -98,7 +98,7 @@ public function getResponse()
     }
 
     /**
-     * Reloads all status data of this object
+     * Reloads all status data of this object.
      */
     public function refresh()
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/IndexTemplate.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/IndexTemplate.php
new file mode 100755
index 0000000..238eeb8
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/IndexTemplate.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Elastica;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Elastica index template object.
+ *
+ * @author Dmitry Balabka <dmitry.balabka@gmail.com>
+ * 
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-templates.html
+ */
+class IndexTemplate
+{
+    /**
+     * Index template name.
+     *
+     * @var string Index pattern
+     */
+    protected $_name = '';
+
+    /**
+     * Client object.
+     *
+     * @var \Elastica\Client Client object
+     */
+    protected $_client = null;
+
+    /**
+     * Creates a new index template object.
+     *
+     * @param \Elastica\Client $client Client object
+     * @param string           $name   Index template name
+     *
+     * @throws \Elastica\Exception\InvalidException
+     */
+    public function __construct(Client $client, $name)
+    {
+        $this->_client = $client;
+
+        if (!is_scalar($name)) {
+            throw new InvalidException('Index template should be a scalar type');
+        }
+        $this->_name = (string) $name;
+    }
+
+    /**
+     * Deletes the index template.
+     *
+     * @return \Elastica\Response Response object
+     */
+    public function delete()
+    {
+        $response = $this->request(Request::DELETE);
+
+        return $response;
+    }
+
+    /**
+     * Creates a new index template with the given arguments.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-templates.html
+     *
+     * @param array $args OPTIONAL Arguments to use
+     *
+     * @return \Elastica\Response
+     */
+    public function create(array $args = array())
+    {
+        return $this->request(Request::PUT, $args);
+    }
+
+    /**
+     * Checks if the given index template is already created.
+     *
+     * @return bool True if index exists
+     */
+    public function exists()
+    {
+        $response = $this->request(Request::HEAD);
+        $info = $response->getTransferInfo();
+
+        return (bool) ($info['http_code'] == 200);
+    }
+
+    /**
+     * Returns the index template name.
+     *
+     * @return string Index name
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Returns index template client.
+     *
+     * @return \Elastica\Client Index client object
+     */
+    public function getClient()
+    {
+        return $this->_client;
+    }
+
+    /**
+     * Makes calls to the elasticsearch server based on this index template name.
+     *
+     * @param string $method Rest method to use (GET, POST, DELETE, PUT)
+     * @param array  $data   OPTIONAL Arguments as array
+     *
+     * @return \Elastica\Response Response object
+     */
+    public function request($method, $data = array())
+    {
+        $path = '/_template/'.$this->getName();
+
+        return $this->getClient()->request($path, $method, $data);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/JSON.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/JSON.php
new file mode 100755
index 0000000..db11844
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/JSON.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Elastica;
+
+use Elastica\Exception\JSONParseException;
+
+/**
+ * Elastica JSON tools.
+ */
+class JSON
+{
+    /**
+     * Parse JSON string to an array.
+     *
+     * @link http://php.net/manual/en/function.json-decode.php
+     * @link http://php.net/manual/en/function.json-last-error.php
+     *
+     * @param string $json JSON string to parse
+     *
+     * @return array PHP array representation of JSON string
+     */
+    public static function parse(/* inherit from json_decode */)
+    {
+        // extract arguments
+        $args = func_get_args();
+
+        // default to decoding into an assoc array
+        if (sizeof($args) === 1) {
+            $args[] = true;
+        }
+
+        // run decode
+        $array = call_user_func_array('json_decode', $args);
+
+        // turn errors into exceptions for easier catching
+        $error = json_last_error();
+        if ($error !== JSON_ERROR_NONE) {
+            throw new JSONParseException($error);
+        }
+
+        // output
+        return $array;
+    }
+
+    /**
+     * Convert input to JSON string with standard options.
+     *
+     * @link http://php.net/manual/en/function.json-encode.php
+     *
+     * @param  mixed check args for PHP function json_encode
+     *
+     * @return string Valid JSON representation of $input
+     */
+    public static function stringify(/* inherit from json_encode */)
+    {
+        // extract arguments
+        $args = func_get_args();
+
+        // allow special options value for Elasticsearch compatibility
+        if (sizeof($args) > 1 && $args[1] === 'JSON_ELASTICSEARCH') {
+            // Use built in JSON constants if available (php >= 5.4)
+            $args[1] = defined('JSON_UNESCAPED_UNICODE') ? JSON_UNESCAPED_UNICODE : 256;
+        }
+
+        // run encode and output
+        return call_user_func_array('json_encode', $args);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Log.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Log.php
index 9385a6c..3f0ba95 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Log.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Log.php
@@ -5,30 +5,28 @@
 use Psr\Log\AbstractLogger;
 
 /**
- * Elastica log object
+ * Elastica log object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class Log extends AbstractLogger
 {
     /**
-     * Log path or true if enabled
+     * Log path or true if enabled.
      *
      * @var string|bool
      */
     protected $_log = true;
 
     /**
-     * Last logged message
+     * Last logged message.
      *
      * @var string Last logged message
      */
     protected $_lastMessage = '';
 
     /**
-     * Inits log object
+     * Inits log object.
      *
      * @param string|bool String to set a specific file for logging
      */
@@ -38,31 +36,32 @@ public function __construct($log = '')
     }
 
     /**
-     * Log a message
+     * Log a message.
      *
-     * @param mixed $level
+     * @param mixed  $level
      * @param string $message
-     * @param array $context
+     * @param array  $context
+     *
      * @return null|void
      */
     public function log($level, $message, array $context = array())
     {
         $context['error_message'] = $message;
-        $this->_lastMessage = json_encode($context);
+        $this->_lastMessage = JSON::stringify($context);
 
         if (!empty($this->_log) && is_string($this->_log)) {
-            error_log($this->_lastMessage . PHP_EOL, 3, $this->_log);
+            error_log($this->_lastMessage.PHP_EOL, 3, $this->_log);
         } else {
             error_log($this->_lastMessage);
         }
-
     }
 
     /**
-     * Enable/disable log or set log path
+     * Enable/disable log or set log path.
+     *
+     * @param bool|string $log Enables log or sets log path
      *
-     * @param  bool|string $log Enables log or sets log path
-     * @return \Elastica\Log
+     * @return $this
      */
     public function setLog($log)
     {
@@ -72,7 +71,7 @@ public function setLog($log)
     }
 
     /**
-     * Return last logged message
+     * Return last logged message.
      *
      * @return string Last logged message
      */
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/MultiBuilder.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/MultiBuilder.php
new file mode 100755
index 0000000..f7e063c
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/MultiBuilder.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Elastica\Multi;
+
+use Elastica\Response;
+use Elastica\Search as BaseSearch;
+
+class MultiBuilder implements MultiBuilderInterface
+{
+    /**
+     * @param Response $response
+     * @param BaseSearch[] $searches
+     * @return ResultSet
+     */
+    public function buildMultiResultSet(Response $response, $searches)
+    {
+        $resultSets = $this->buildResultSets($response, $searches);
+
+        return new ResultSet($response, $resultSets);
+    }
+
+    /**
+     * @param Response $childResponse
+     * @param BaseSearch $search
+     * @return \Elastica\ResultSet
+     */
+    private function buildResultSet(Response $childResponse, BaseSearch $search)
+    {
+        return $search->getResultSetBuilder()->buildResultSet($childResponse, $search->getQuery());
+    }
+
+    /**
+     * @param Response $response
+     * @param BaseSearch[] $searches
+     * @return \Elastica\ResultSet[]
+     */
+    private function buildResultSets(Response $response, $searches)
+    {
+        $resultSets = [];
+
+        $data = $response->getData();
+        if (!isset($data['responses']) || !is_array($data['responses'])) {
+            return $resultSets;
+        }
+
+        reset($searches);
+
+        foreach ($data['responses'] as $index => $responseData) {
+            list ($key, $search) = each($searches);
+
+            $resultSets[$key] = $this->buildResultSet(new Response($responseData), $search);
+        }
+
+        return $resultSets;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/MultiBuilderInterface.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/MultiBuilderInterface.php
new file mode 100755
index 0000000..65cc27f
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/MultiBuilderInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Elastica\Multi;
+
+use Elastica\Response;
+use Elastica\Search as BaseSearch;
+
+interface MultiBuilderInterface
+{
+    /**
+     * @param Response $response
+     * @param BaseSearch[] $searches
+     * @return ResultSet
+     */
+    public function buildMultiResultSet(Response $response, $searches);
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/ResultSet.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/ResultSet.php
index a0df578..d83485e 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/ResultSet.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/ResultSet.php
@@ -1,82 +1,49 @@
 <?php
 
 namespace Elastica\Multi;
-use Elastica\Exception\InvalidException;
+
 use Elastica\Response;
-use Elastica\Search as BaseSearch;
 use Elastica\ResultSet as BaseResultSet;
 
 /**
  * Elastica multi search result set
- * List of result sets for each search request
+ * List of result sets for each search request.
  *
- * @category Xodoa
- * @package Elastica
  * @author munkie
  */
 class ResultSet implements \Iterator, \ArrayAccess, \Countable
 {
     /**
-     * Result Sets
+     * Result Sets.
      *
      * @var array|\Elastica\ResultSet[] Result Sets
      */
     protected $_resultSets = array();
 
     /**
-     * Current position
+     * Current position.
      *
      * @var int Current position
      */
     protected $_position = 0;
 
     /**
-     * Response
+     * Response.
      *
      * @var \Elastica\Response Response object
      */
     protected $_response;
 
     /**
-     * Constructs ResultSet object
+     * Constructs ResultSet object.
      *
-     * @param \Elastica\Response       $response
-     * @param array|\Elastica\Search[] $searches
+     * @param \Elastica\Response $response
+     * @param BaseResultSet[]
      */
-    public function __construct(Response $response, array $searches)
-    {
-        $this->rewind();
-        $this->_init($response, $searches);
-    }
-
-    /**
-     * @param  \Elastica\Response                   $response
-     * @param  array|\Elastica\Search[]             $searches
-     * @throws \Elastica\Exception\InvalidException
-     */
-    protected function _init(Response $response, array $searches)
+    public function __construct(Response $response, $resultSets)
     {
         $this->_response = $response;
-        $responseData = $response->getData();
-
-        if (isset($responseData['responses']) && is_array($responseData['responses'])) {
-            reset($searches);
-            foreach ($responseData['responses'] as $key => $responseData) {
-                $currentSearch = each($searches);
-
-                if ($currentSearch === false) {
-                    throw new InvalidException('No result found for search #' . $key);
-                } elseif (!$currentSearch['value'] instanceof BaseSearch) {
-                    throw new InvalidException('Invalid object for search #' . $key . ' provided. Should be Elastica\Search');
-                }
-
-                $search = $currentSearch['value'];
-                $query = $search->getQuery();
-
-                $response = new Response($responseData);
-                $this->_resultSets[$currentSearch['key']] = new BaseResultSet($response, $query);
-            }
-        }
+        $this->_resultSets = $resultSets;
     }
 
     /**
@@ -88,7 +55,7 @@ public function getResultSets()
     }
 
     /**
-     * Returns response object
+     * Returns response object.
      *
      * @return \Elastica\Response Response object
      */
@@ -98,7 +65,7 @@ public function getResponse()
     }
 
     /**
-     * There is at least one result set with error
+     * There is at least one result set with error.
      *
      * @return bool
      */
@@ -126,11 +93,10 @@ public function current()
     }
 
     /**
-     * @return void
      */
     public function next()
     {
-        $this->_position++;
+        ++$this->_position;
     }
 
     /**
@@ -150,7 +116,6 @@ public function valid()
     }
 
     /**
-     * @return void
      */
     public function rewind()
     {
@@ -166,8 +131,9 @@ public function count()
     }
 
     /**
-     * @param  string|int $offset
-     * @return boolean true on success or false on failure.
+     * @param string|int $offset
+     *
+     * @return bool true on success or false on failure.
      */
     public function offsetExists($offset)
     {
@@ -176,6 +142,7 @@ public function offsetExists($offset)
 
     /**
      * @param mixed $offset
+     *
      * @return mixed Can return all value types.
      */
     public function offsetGet($offset)
@@ -186,7 +153,6 @@ public function offsetGet($offset)
     /**
      * @param mixed $offset
      * @param mixed $value
-     * @return void
      */
     public function offsetSet($offset, $value)
     {
@@ -199,7 +165,6 @@ public function offsetSet($offset, $value)
 
     /**
      * @param mixed $offset
-     * @return void
      */
     public function offsetUnset($offset)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/Search.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/Search.php
index d3ffeb3..d6b0301 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/Search.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Multi/Search.php
@@ -3,23 +3,28 @@
 namespace Elastica\Multi;
 
 use Elastica\Client;
+use Elastica\JSON;
 use Elastica\Request;
 use Elastica\Search as BaseSearch;
 
 /**
- * Elastica multi search
+ * Elastica multi search.
  *
- * @category Xodoa
- * @package Elastica
  * @author munkie
- * @link http://www.elasticsearch.org/guide/reference/api/multi-search.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html
  */
 class Search
 {
     /**
-     * @var array|\Elastica\Search[]
+     * @var MultiBuilderInterface
      */
-    protected $_searches = array();
+    private $_builder;
+
+    /**
+     * @var \Elastica\Client
+     */
+    protected $_client;
 
     /**
      * @var array
@@ -27,18 +32,20 @@ class Search
     protected $_options = array();
 
     /**
-     * @var \Elastica\Client
+     * @var array|\Elastica\Search[]
      */
-    protected $_client;
+    protected $_searches = array();
 
     /**
-     * Constructs search object
+     * Constructs search object.
      *
      * @param \Elastica\Client $client Client object
+     * @param MultiBuilderInterface $builder
      */
-    public function __construct(Client $client)
+    public function __construct(Client $client, MultiBuilderInterface $builder = null)
     {
-        $this->setClient($client);
+        $this->_builder = $builder ?: new MultiBuilder();
+        $this->_client = $client;
     }
 
     /**
@@ -50,18 +57,7 @@ public function getClient()
     }
 
     /**
-     * @param  \Elastica\Client       $client
-     * @return \Elastica\Multi\Search
-     */
-    public function setClient(Client $client)
-    {
-        $this->_client = $client;
-
-        return $this;
-    }
-
-    /**
-     * @return \Elastica\Multi\Search
+     * @return $this
      */
     public function clearSearches()
     {
@@ -70,25 +66,27 @@ public function clearSearches()
         return $this;
     }
 
-  /**
-   * @param  \Elastica\Search $search
-   * @param  string           $key      Optional key
-   * @return \Elastica\Multi\Search
-   */
+    /**
+     * @param \Elastica\Search $search
+     * @param string           $key    Optional key
+     *
+     * @return $this
+     */
     public function addSearch(BaseSearch $search, $key = null)
     {
         if ($key) {
-          $this->_searches[$key] = $search;
+            $this->_searches[$key] = $search;
         } else {
-          $this->_searches[]     = $search;
+            $this->_searches[] = $search;
         }
 
         return $this;
     }
 
     /**
-     * @param  array|\Elastica\Search[] $searches
-     * @return \Elastica\Multi\Search
+     * @param array|\Elastica\Search[] $searches
+     *
+     * @return $this
      */
     public function addSearches(array $searches)
     {
@@ -100,8 +98,9 @@ public function addSearches(array $searches)
     }
 
     /**
-     * @param  array|\Elastica\Search[] $searches
-     * @return \Elastica\Multi\Search
+     * @param array|\Elastica\Search[] $searches
+     *
+     * @return $this
      */
     public function setSearches(array $searches)
     {
@@ -120,8 +119,9 @@ public function getSearches()
     }
 
     /**
-     * @param  string                $searchType
-     * @return \Elastica\Multi\Search
+     * @param string $searchType
+     *
+     * @return $this
      */
     public function setSearchType($searchType)
     {
@@ -144,7 +144,7 @@ public function search()
             $this->_options
         );
 
-        return new ResultSet($response, $this->getSearches());
+        return $this->_builder->buildMultiResultSet($response, $this->getSearches());
     }
 
     /**
@@ -154,30 +154,32 @@ protected function _getData()
     {
         $data = '';
         foreach ($this->getSearches() as $search) {
-            $data.= $this->_getSearchData($search);
+            $data .= $this->_getSearchData($search);
         }
 
         return $data;
     }
 
     /**
-     * @param  \Elastica\Search $search
+     * @param \Elastica\Search $search
+     *
      * @return string
      */
     protected function _getSearchData(BaseSearch $search)
     {
         $header = $this->_getSearchDataHeader($search);
-        $header = (empty($header)) ? new \stdClass : $header;
+        $header = (empty($header)) ? new \stdClass() : $header;
         $query = $search->getQuery();
 
-        $data = json_encode($header) . "\n";
-        $data.= json_encode($query->toArray()) . "\n";
+        $data = JSON::stringify($header)."\n";
+        $data .= JSON::stringify($query->toArray())."\n";
 
         return $data;
     }
 
     /**
-     * @param  \Elastica\Search $search
+     * @param \Elastica\Search $search
+     *
      * @return array
      */
     protected function _getSearchDataHeader(BaseSearch $search)
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/NameableInterface.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/NameableInterface.php
new file mode 100755
index 0000000..83b4373
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/NameableInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Elastica;
+
+/**
+ * Interface for named objects.
+ *
+ *
+ * @author Evgeniy Sokolov <ewgraf@gmail.com>
+ */
+interface NameableInterface
+{
+    /**
+     * Retrieve the name of this object.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Set the name of this object.
+     *
+     * @param string $name
+     *
+     * @return $this
+     */
+    public function setName($name);
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node.php
index a9684ca..3eee405 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node.php
@@ -1,72 +1,98 @@
 <?php
 
 namespace Elastica;
+
 use Elastica\Node\Info;
 use Elastica\Node\Stats;
 
 /**
- * Elastica cluster node object
+ * Elastica cluster node object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-status.html
  */
 class Node
 {
     /**
-     * Client
+     * Client.
      *
      * @var \Elastica\Client
      */
     protected $_client = null;
 
     /**
-     * Node name
+     * @var string Unique node id
+     */
+    protected $_id = '';
+
+    /**
+     * Node name.
      *
      * @var string Node name
      */
     protected $_name = '';
 
     /**
-     * Node stats
+     * Node stats.
      *
      * @var \Elastica\Node\Stats Node Stats
      */
     protected $_stats = null;
 
     /**
-     * Node info
+     * Node info.
      *
      * @var \Elastica\Node\Info Node info
      */
     protected $_info = null;
 
     /**
-     * Create a new node object
+     * Create a new node object.
      *
-     * @param string          $name   Node name
+     * @param string           $id     Node id or name
      * @param \Elastica\Client $client Node object
      */
-    public function __construct($name, Client $client)
+    public function __construct($id, Client $client)
     {
-        $this->_name = $name;
         $this->_client = $client;
-        $this->refresh();
+        $this->setId($id);
+    }
+
+    /**
+     * @return string Unique node id. Can also be name if id not exists.
+     */
+    public function getId()
+    {
+        return $this->_id;
+    }
+
+    /**
+     * @param string $id Node id
+     *
+     * @return $this Refreshed object
+     */
+    public function setId($id)
+    {
+        $this->_id = $id;
+
+        return $this->refresh();
     }
 
     /**
-     * Get the name of the node
+     * Get the name of the node.
      *
      * @return string Node name
      */
     public function getName()
     {
+        if (empty($this->_name)) {
+            $this->_name = $this->getInfo()->getName();
+        }
+
         return $this->_name;
     }
 
     /**
-     * Returns the current client object
+     * Returns the current client object.
      *
      * @return \Elastica\Client Client
      */
@@ -76,7 +102,9 @@ public function getClient()
     }
 
     /**
-     * Return stats object of the current node
+     * Return stats object of the current node.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html
      *
      * @return \Elastica\Node\Stats Node stats
      */
@@ -90,7 +118,9 @@ public function getStats()
     }
 
     /**
-     * Return info object of the current node
+     * Return info object of the current node.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-info.html
      *
      * @return \Elastica\Node\Info Node info object
      */
@@ -104,7 +134,7 @@ public function getInfo()
     }
 
     /**
-     * Refreshes all node information
+     * Refreshes all node information.
      *
      * This should be called after updating a node to refresh all information
      */
@@ -115,15 +145,17 @@ public function refresh()
     }
 
     /**
-     * Shuts this node down
+     * Shuts this node down.
+     *
+     * @param string $delay OPTIONAL Delay after which node is shut down (default = 1s)
      *
-     * @param  string            $delay OPTIONAL Delay after which node is shut down (default = 1s)
      * @return \Elastica\Response
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-cluster-nodes-shutdown.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-shutdown.html
      */
     public function shutdown($delay = '1s')
     {
-        $path = '_cluster/nodes/' . $this->getName() . '/_shutdown?delay=' . $delay;
+        $path = '_cluster/nodes/'.$this->getId().'/_shutdown?delay='.$delay;
 
         return $this->_client->request($path, Request::POST);
     }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node/Info.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node/Info.php
index 6ebe476..7af0b0d 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node/Info.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node/Info.php
@@ -6,48 +6,47 @@
 use Elastica\Request;
 
 /**
- * Elastica cluster node object
+ * Elastica cluster node object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-status.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-status.html
  */
 class Info
 {
     /**
-     * Response
+     * Response.
      *
      * @var \Elastica\Response Response object
      */
     protected $_response = null;
 
     /**
-     * Stats data
+     * Stats data.
      *
      * @var array stats data
      */
     protected $_data = array();
 
     /**
-     * Node
+     * Node.
      *
      * @var \Elastica\Node Node object
      */
     protected $_node = null;
 
     /**
-     * Query parameters
+     * Query parameters.
      *
      * @var array
      */
     protected $_params = array();
 
     /**
-     * Create new info object for node
+     * Create new info object for node.
      *
      * @param \Elastica\Node $node   Node object
-     * @param array         $params List of params to return. Can be: settings, os, process, jvm, thread_pool, network, transport, http
+     * @param array          $params List of params to return. Can be: settings, os, process, jvm, thread_pool, network, transport, http
      */
     public function __construct(BaseNode $node, array $params = array())
     {
@@ -73,7 +72,7 @@ public function get()
             if (isset($data[$arg])) {
                 $data = $data[$arg];
             } else {
-                return null;
+                return;
             }
         }
 
@@ -81,7 +80,7 @@ public function get()
     }
 
     /**
-     * Return port of the node
+     * Return port of the node.
      *
      * @return string Returns Node port
      */
@@ -96,7 +95,7 @@ public function getPort()
     }
 
     /**
-     * Return IP of the node
+     * Return IP of the node.
      *
      * @return string Returns Node ip address
      */
@@ -111,37 +110,43 @@ public function getIp()
     }
 
     /**
-     * Return data regarding plugins installed on this node
+     * Return data regarding plugins installed on this node.
+     *
      * @return array plugin data
-     * @link http://www.elasticsearch.org/guide/reference/api/admin-cluster-nodes-info/
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-info.html
      */
     public function getPlugins()
     {
-        if(!in_array('plugin', $this->_params)) {
+        if (!in_array('plugins', $this->_params)) {
             //Plugin data was not retrieved when refresh() was called last. Get it now.
-            $this->_params[] = 'plugin';
+            $this->_params[] = 'plugins';
             $this->refresh($this->_params);
         }
+
         return $this->get('plugins');
     }
 
     /**
-     * Check if the given plugin is installed on this node
+     * Check if the given plugin is installed on this node.
+     *
      * @param string $name plugin name
+     *
      * @return bool true if the plugin is installed, false otherwise
      */
     public function hasPlugin($name)
     {
-        foreach($this->getPlugins() as $plugin) {
-            if($plugin['name'] == $name) {
+        foreach ($this->getPlugins() as $plugin) {
+            if ($plugin['name'] == $name) {
                 return true;
             }
         }
+
         return false;
     }
 
     /**
-     * Return all info data
+     * Return all info data.
      *
      * @return array Data array
      */
@@ -151,7 +156,7 @@ public function getData()
     }
 
     /**
-     * Return node object
+     * Return node object.
      *
      * @return \Elastica\Node Node object
      */
@@ -161,7 +166,23 @@ public function getNode()
     }
 
     /**
-     * Returns response object
+     * @return string Unique node id
+     */
+    public function getId()
+    {
+        return $this->_id;
+    }
+
+    /**
+     * @return string Node name
+     */
+    public function getName()
+    {
+        return $this->_data['name'];
+    }
+
+    /**
+     * Returns response object.
      *
      * @return \Elastica\Response Response object
      */
@@ -171,26 +192,30 @@ public function getResponse()
     }
 
     /**
-     * Reloads all nodes information. Has to be called if informations changed
+     * Reloads all nodes information. Has to be called if informations changed.
+     *
+     * @param array $params Params to return (default none). Possible options: settings, os, process, jvm, thread_pool, network, transport, http, plugin
      *
-     * @param  array             $params Params to return (default none). Possible options: settings, os, process, jvm, thread_pool, network, transport, http, plugin
      * @return \Elastica\Response Response object
      */
     public function refresh(array $params = array())
     {
         $this->_params = $params;
 
-        $path = '_cluster/nodes/' . $this->getNode()->getName();
+        $path = '_nodes/'.$this->getNode()->getId();
 
         if (!empty($params)) {
             $path .= '?';
             foreach ($params as $param) {
-                $path .= $param . '=true&';
+                $path .= $param.'=true&';
             }
         }
 
         $this->_response = $this->getNode()->getClient()->request($path, Request::GET);
         $data = $this->getResponse()->getData();
+
         $this->_data = reset($data['nodes']);
+        $this->_id = key($data['nodes']);
+        $this->getNode()->setId($this->getId());
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node/Stats.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node/Stats.php
index ee1abd0..96640f3 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node/Stats.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Node/Stats.php
@@ -6,38 +6,37 @@
 use Elastica\Request;
 
 /**
- * Elastica cluster node object
+ * Elastica cluster node object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-status.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-status.html
  */
 class Stats
 {
     /**
-     * Response
+     * Response.
      *
      * @var \Elastica\Response Response object
      */
     protected $_response = null;
 
     /**
-     * Stats data
+     * Stats data.
      *
      * @var array stats data
      */
     protected $_data = array();
 
     /**
-     * Node
+     * Node.
      *
      * @var \Elastica\Node Node object
      */
     protected $_node = null;
 
     /**
-     * Create new stats for node
+     * Create new stats for node.
      *
      * @param \Elastica\Node $node Elastica node object
      */
@@ -48,7 +47,7 @@ public function __construct(BaseNode $node)
     }
 
     /**
-     * Returns all node stats as array based on the arguments
+     * Returns all node stats as array based on the arguments.
      *
      * Several arguments can be use
      * get('index', 'test', 'example')
@@ -63,7 +62,7 @@ public function get()
             if (isset($data[$arg])) {
                 $data = $data[$arg];
             } else {
-                return null;
+                return;
             }
         }
 
@@ -71,7 +70,7 @@ public function get()
     }
 
     /**
-     * Returns all stats data
+     * Returns all stats data.
      *
      * @return array Data array
      */
@@ -81,7 +80,7 @@ public function getData()
     }
 
     /**
-     * Returns node object
+     * Returns node object.
      *
      * @return \Elastica\Node Node object
      */
@@ -91,7 +90,7 @@ public function getNode()
     }
 
     /**
-     * Returns response object
+     * Returns response object.
      *
      * @return \Elastica\Response Response object
      */
@@ -101,13 +100,13 @@ public function getResponse()
     }
 
     /**
-     * Reloads all nodes information. Has to be called if informations changed
+     * Reloads all nodes information. Has to be called if informations changed.
      *
      * @return \Elastica\Response Response object
      */
     public function refresh()
     {
-        $path = '_cluster/nodes/' . $this->getNode()->getName() . '/stats';
+        $path = '_nodes/'.$this->getNode()->getName().'/stats';
         $this->_response = $this->getNode()->getClient()->request($path, Request::GET);
         $data = $this->getResponse()->getData();
         $this->_data = reset($data['nodes']);
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Param.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Param.php
index d84f18e..35dce11 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Param.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Param.php
@@ -1,28 +1,27 @@
 <?php
 
 namespace Elastica;
+
 use Elastica\Exception\InvalidException;
 
 /**
- * Class to handle params
+ * Class to handle params.
  *
- * This function can be used to handle params for queries, filter, facets
+ * This function can be used to handle params for queries, filter
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
-class Param
+class Param implements ArrayableInterface
 {
     /**
-     * Params
+     * Params.
      *
      * @var array
      */
     protected $_params = array();
 
     /**
-     * Raw Params
+     * Raw Params.
      *
      * @var array
      */
@@ -31,7 +30,7 @@ class Param
     /**
      * Converts the params to an array. A default implementation exist to create
      * the an array out of the class name (last part of the class name)
-     * and the params
+     * and the params.
      *
      * @return array Filter array
      */
@@ -43,13 +42,37 @@ public function toArray()
             $data = array_merge($data, $this->_rawParams);
         }
 
-        return $data;
+        return $this->_convertArrayable($data);
+    }
+
+    /**
+     * Cast objects to arrays.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    protected function _convertArrayable(array $array)
+    {
+        $arr = array();
+
+        foreach ($array as $key => $value) {
+            if ($value instanceof ArrayableInterface) {
+                $arr[$value instanceof NameableInterface ? $value->getName() : $key] = $value->toArray();
+            } elseif (is_array($value)) {
+                $arr[$key] = $this->_convertArrayable($value);
+            } else {
+                $arr[$key] = $value;
+            }
+        }
+
+        return $arr;
     }
 
     /**
      * Param's name
      * Picks the last part of the class name and makes it snake_case
-     * You can override this method if you want to change the name
+     * You can override this method if you want to change the name.
      *
      * @return string name
      */
@@ -59,11 +82,12 @@ protected function _getBaseName()
     }
 
     /**
-     * Sets params not inside params array
+     * Sets params not inside params array.
+     *
+     * @param string $key
+     * @param mixed  $value
      *
-     * @param  string         $key
-     * @param  mixed          $value
-     * @return \Elastica\Param
+     * @return $this
      */
     protected function _setRawParam($key, $value)
     {
@@ -73,11 +97,12 @@ protected function _setRawParam($key, $value)
     }
 
     /**
-     * Sets (overwrites) the value at the given key
+     * Sets (overwrites) the value at the given key.
      *
-     * @param  string         $key   Key to set
-     * @param  mixed          $value Key Value
-     * @return \Elastica\Param
+     * @param string $key   Key to set
+     * @param mixed  $value Key Value
+     *
+     * @return $this
      */
     public function setParam($key, $value)
     {
@@ -87,10 +112,11 @@ public function setParam($key, $value)
     }
 
     /**
-     * Sets (overwrites) all params of this object
+     * Sets (overwrites) all params of this object.
+     *
+     * @param array $params Parameter list
      *
-     * @param  array          $params Parameter list
-     * @return \Elastica\Param
+     * @return $this
      */
     public function setParams(array $params)
     {
@@ -104,46 +130,50 @@ public function setParams(array $params)
      *
      * This function can be used to add an array of params
      *
-     * @param  string         $key   Param key
-     * @param  mixed          $value Value to set
-     * @return \Elastica\Param
+     * @param string $key   Param key
+     * @param mixed  $value Value to set
+     *
+     * @return $this
      */
     public function addParam($key, $value)
     {
-        if($key != null) {
+        if ($key != null) {
             if (!isset($this->_params[$key])) {
                 $this->_params[$key] = array();
             }
 
             $this->_params[$key][] = $value;
         } else {
-            $this->_params = $value;            
+            $this->_params = $value;
         }
 
         return $this;
     }
 
     /**
-     * Returns a specific param
+     * Returns a specific param.
+     *
+     * @param string $key Key to return
      *
-     * @param  string                              $key Key to return
-     * @return mixed                               Key value
      * @throws \Elastica\Exception\InvalidException If requested key is not set
+     *
+     * @return mixed Key value
      */
     public function getParam($key)
     {
-        if (!isset($this->_params[$key])) {
-            throw new InvalidException('Param ' . $key . ' does not exist');
+        if (!$this->hasParam($key)) {
+            throw new InvalidException('Param '.$key.' does not exist');
         }
 
         return $this->_params[$key];
     }
 
     /**
-     * Test if a param is set
+     * Test if a param is set.
+     *
+     * @param string $key Key to test
      *
-     * @param  string  $key Key to test
-     * @return boolean True if the param is set, false otherwise
+     * @return bool True if the param is set, false otherwise
      */
     public function hasParam($key)
     {
@@ -151,7 +181,7 @@ public function hasParam($key)
     }
 
     /**
-     * Returns the params array
+     * Returns the params array.
      *
      * @return array Params
      */
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Percolator.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Percolator.php
index eed050f..ceaf131 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Percolator.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Percolator.php
@@ -3,24 +3,41 @@
 namespace Elastica;
 
 /**
- * Percolator class
+ * Percolator class.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/api/percolate/
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-percolate.html
  */
 class Percolator
 {
+    const EXTRA_FILTER = 'filter';
+    const EXTRA_QUERY = 'query';
+    const EXTRA_SIZE = 'size';
+    const EXTRA_TRACK_SCORES = 'track_scores';
+    const EXTRA_SORT = 'sort';
+    const EXTRA_AGGS = 'aggs';
+    const EXTRA_HIGHLIGHT = 'highlight';
+
+    private $_extraRequestBodyOptions = array(
+        self::EXTRA_FILTER,
+        self::EXTRA_QUERY,
+        self::EXTRA_SIZE,
+        self::EXTRA_TRACK_SCORES,
+        self::EXTRA_SORT,
+        self::EXTRA_AGGS,
+        self::EXTRA_HIGHLIGHT,
+    );
+
     /**
-     * Index object
+     * Index object.
      *
      * @var \Elastica\Index
      */
     protected $_index = null;
 
     /**
-     * Construct new percolator
+     * Construct new percolator.
      *
      * @param \Elastica\Index $index
      */
@@ -32,62 +49,138 @@ public function __construct(Index $index)
     /**
      * Registers a percolator query, with optional extra fields to include in the registered query.
      *
-     * @param  string                                               $name   Query name
-     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query  Query to add
-     * @param  array                                                $fields Extra fields to include in the registered query
-     *                                                                      and can be used to filter executed queries. 
+     * @param string                                               $name   Query name
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query  Query to add
+     * @param array                                                $fields Extra fields to include in the registered query
+     *                                                                     and can be used to filter executed queries.
+     *
      * @return \Elastica\Response
      */
     public function registerQuery($name, $query, $fields = array())
     {
-        $path = '_percolator/' . $this->_index->getName() . '/' . $name;
+        $path = $this->_index->getName().'/.percolator/'.$name;
         $query = Query::create($query);
-        
+
         $data = array_merge($query->toArray(), $fields);
 
         return $this->_index->getClient()->request($path, Request::PUT, $data);
     }
 
     /**
-     * Removes a percolator query
-     * @param  string            $name query name
+     * Removes a percolator query.
+     *
+     * @param string $name query name
+     *
      * @return \Elastica\Response
      */
     public function unregisterQuery($name)
     {
-        $path = '_percolator/' . $this->_index->getName() . '/' . $name;
+        $path = $this->_index->getName().'/.percolator/'.$name;
 
         return $this->_index->getClient()->request($path, Request::DELETE);
     }
 
     /**
-     * Match a document to percolator queries
+     * Match a document to percolator queries.
      *
-     * @param  \Elastica\Document                                   $doc
-     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query Query to filter the percolator queries which
+     * @param \Elastica\Document                                   $doc
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query  Query to filter the percolator queries which
      *                                                                     are executed.
-     * @param  string                                               $type
+     * @param string                                               $type
+     * @param array                                                $params Supports setting additional request body options to the percolate request.
+     *                                                                     [ Percolator::EXTRA_FILTER,
+     *                                                                     Percolator::EXTRA_QUERY,
+     *                                                                     Percolator::EXTRA_SIZE,
+     *                                                                     Percolator::EXTRA_TRACK_SCORES,
+     *                                                                     Percolator::EXTRA_SORT,
+     *                                                                     Percolator::EXTRA_AGGS,
+     *                                                                     Percolator::EXTRA_HIGHLIGHT ]
+     *
      * @return array With matching registered queries.
      */
-    public function matchDoc(Document $doc, $query = null, $type = 'type')
+    public function matchDoc(Document $doc, $query = null, $type = 'type', $params = array())
     {
-        $path = $this->_index->getName() . '/' . $type . '/_percolate';
+        $path = $this->_index->getName().'/'.$type.'/_percolate';
         $data = array('doc' => $doc->getData());
 
+        $this->_applyAdditionalRequestBodyOptions($params, $data);
+
+        return $this->_percolate($path, $query, $data, $params);
+    }
+
+    /**
+     * Percolating an existing document.
+     *
+     * @param string                                               $id
+     * @param string                                               $type
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query  Query to filter the percolator queries which
+     *                                                                     are executed.
+     * @param array                                                $params Supports setting additional request body options to the percolate request.
+     *                                                                     [ Percolator::EXTRA_FILTER,
+     *                                                                     Percolator::EXTRA_QUERY,
+     *                                                                     Percolator::EXTRA_SIZE,
+     *                                                                     Percolator::EXTRA_TRACK_SCORES,
+     *                                                                     Percolator::EXTRA_SORT,
+     *                                                                     Percolator::EXTRA_AGGS,
+     *                                                                     Percolator::EXTRA_HIGHLIGHT ]
+     *
+     * @return array With matching registered queries.
+     */
+    public function matchExistingDoc($id, $type, $query = null, $params = array())
+    {
+        $id = urlencode($id);
+        $path = $this->_index->getName().'/'.$type.'/'.$id.'/_percolate';
+
+        $data = array();
+        $this->_applyAdditionalRequestBodyOptions($params, $data);
+
+        return $this->_percolate($path, $query, $data, $params);
+    }
+
+    /**
+     * Process the provided parameters and apply them to the data array.
+     *
+     * @param &$params
+     * @param &$data
+     */
+    protected function _applyAdditionalRequestBodyOptions(&$params, &$data)
+    {
+        foreach ($params as $key => $value) {
+            if (in_array($key, $this->_extraRequestBodyOptions)) {
+                $data[$key] = $params[$key];
+                unset($params[$key]);
+            }
+        }
+    }
+
+    /**
+     * @param string                                               $path
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query] $query  [description]
+     * @param array                                                $data
+     * @param array                                                $params
+     *
+     * @return array
+     */
+    protected function _percolate($path, $query, $data = array(), $params = array())
+    {
         // Add query to filter the percolator queries which are executed.
         if ($query) {
             $query = Query::create($query);
-            $data['query'] = $query->getQuery();
+            $data['query'] = $query->getQuery()->toArray();
         }
 
-        $response = $this->getIndex()->getClient()->request($path, Request::GET, $data);
+        $response = $this->getIndex()->getClient()->request($path, Request::GET, $data, $params);
         $data = $response->getData();
 
-        return $data['matches'];
+        if (isset($data['matches'])) {
+            return $data['matches'];
+        }
+
+        return array();
     }
 
     /**
-     * Return index object
+     * Return index object.
      *
      * @return \Elastica\Index
      */
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query.php
index 6c01425..47325b9 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query.php
@@ -1,43 +1,45 @@
 <?php
 
 namespace Elastica;
+
+use Elastica\Aggregation\AbstractAggregation;
 use Elastica\Exception\InvalidException;
 use Elastica\Exception\NotImplementedException;
-use Elastica\Facet\AbstractFacet;
 use Elastica\Filter\AbstractFilter;
 use Elastica\Query\AbstractQuery;
 use Elastica\Query\MatchAll;
 use Elastica\Query\QueryString;
+use Elastica\Script\AbstractScript;
+use Elastica\Script\ScriptFields;
 use Elastica\Suggest\AbstractSuggest;
 
 /**
- * Elastica query object
+ * Elastica query object.
  *
  * Creates different types of queries
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/api/search/
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-body.html
  */
 class Query extends Param
 {
     /**
-     * Params
+     * Params.
      *
      * @var array Params
      */
     protected $_params = array();
-    
+
     /**
-    * Suggest query or not
-    *
-    * @var int Suggest
-    */
+     * Suggest query or not.
+     *
+     * @var int Suggest
+     */
     protected $_suggest = 0;
 
     /**
-     * Creates a query object
+     * Creates a query object.
      *
      * @param array|\Elastica\Query\AbstractQuery $query OPTIONAL Query object (default = null)
      */
@@ -47,30 +49,33 @@ public function __construct($query = null)
             $this->setRawQuery($query);
         } elseif ($query instanceof AbstractQuery) {
             $this->setQuery($query);
-        } elseif ($query instanceof AbstractSuggest) {
-            $this->addSuggest($query);
+        } elseif ($query instanceof Suggest) {
+            $this->setSuggest($query);
         }
     }
 
     /**
-     * Transforms a string or an array to a query object
+     * Transforms a string or an array to a query object.
      *
      * If query is empty,
      *
-     * @param  mixed                                      $query
+     * @param mixed $query
+     *
      * @throws \Elastica\Exception\NotImplementedException
-     * @return \Elastica\Query
+     *
+     * @return self
      */
     public static function create($query)
     {
         switch (true) {
-            case $query instanceof Query:
+            case $query instanceof self:
                 return $query;
             case $query instanceof AbstractQuery:
                 return new self($query);
             case $query instanceof AbstractFilter:
+                trigger_error('Deprecated: Elastica\Query::create() passing filter is deprecated. Create query and use setPostFilter with AbstractQuery instead.', E_USER_DEPRECATED);
                 $newQuery = new self();
-                $newQuery->setFilter($query);
+                $newQuery->setPostFilter($query);
 
                 return $newQuery;
             case empty($query):
@@ -80,6 +85,9 @@ public static function create($query)
             case is_string($query):
                 return new self(new QueryString($query));
             case $query instanceof AbstractSuggest:
+                return new self(new Suggest($query));
+
+            case $query instanceof Suggest:
                 return new self($query);
 
         }
@@ -89,10 +97,11 @@ public static function create($query)
     }
 
     /**
-     * Sets query as raw array. Will overwrite all already set arguments
+     * Sets query as raw array. Will overwrite all already set arguments.
+     *
+     * @param array $query Query array
      *
-     * @param  array          $query Query array
-     * @return \Elastica\Query Query object
+     * @return $this
      */
     public function setRawQuery(array $query)
     {
@@ -102,20 +111,21 @@ public function setRawQuery(array $query)
     }
 
     /**
-     * Sets the query
+     * Sets the query.
      *
-     * @param  \Elastica\Query\AbstractQuery $query Query object
-     * @return \Elastica\Query               Query object
+     * @param \Elastica\Query\AbstractQuery $query Query object
+     *
+     * @return $this
      */
     public function setQuery(AbstractQuery $query)
     {
-        return $this->setParam('query', $query->toArray());
+        return $this->setParam('query', $query);
     }
 
     /**
-     * Gets the query array
+     * Gets the query object.
      *
-     * @return array
+     * @return \Elastica\Query\AbstractQuery
      **/
     public function getQuery()
     {
@@ -123,21 +133,34 @@ public function getQuery()
     }
 
     /**
-     * Set Filter
+     * Set Filter.
+     *
+     * @param \Elastica\Query\AbstractQuery $filter Filter object
+     *
+     * @return $this
      *
-     * @param  \Elastica\Filter\AbstractFilter $filter Filter object
-     * @return \Elastica\Query                 Current object
+     * @link    https://github.com/elasticsearch/elasticsearch/issues/7422
+     * @deprecated Use Elastica\Query::setPostFilter() instead, this method will be removed in further Elastica releases
      */
-    public function setFilter(AbstractFilter $filter)
+    public function setFilter($filter)
     {
-        return $this->setParam('filter', $filter->toArray());
+        if ($filter instanceof AbstractFilter) {
+            trigger_error('Deprecated: Elastica\Query::setFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', E_USER_DEPRECATED);
+        } elseif (!($filter instanceof AbstractQuery)) {
+            throw new InvalidException('Filter must be instance of AbstractQuery');
+        }
+
+        trigger_error('Deprecated: Elastica\Query::setFilter() is deprecated and will be removed in further Elastica releases. Use Elastica\Query::setPostFilter() instead.', E_USER_DEPRECATED);
+
+        return $this->setPostFilter($filter);
     }
 
     /**
-     * Sets the start from which the search results should be returned
+     * Sets the start from which the search results should be returned.
      *
-     * @param  int            $from
-     * @return \Elastica\Query Query object
+     * @param int $from
+     *
+     * @return $this
      */
     public function setFrom($from)
     {
@@ -146,11 +169,13 @@ public function setFrom($from)
 
     /**
      * Sets sort arguments for the query
-     * Replaces existing values
+     * Replaces existing values.
+     *
+     * @param array $sortArgs Sorting arguments
+     *
+     * @return $this
      *
-     * @param  array          $sortArgs Sorting arguments
-     * @return \Elastica\Query Query object
-     * @link http://www.elasticsearch.org/guide/reference/api/search/sort.html
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html
      */
     public function setSort(array $sortArgs)
     {
@@ -158,11 +183,13 @@ public function setSort(array $sortArgs)
     }
 
     /**
-     * Adds a sort param to the query
+     * Adds a sort param to the query.
      *
-     * @param  mixed          $sort Sort parameter
-     * @return \Elastica\Query Query object
-     * @link http://www.elasticsearch.org/guide/reference/api/search/sort.html
+     * @param mixed $sort Sort parameter
+     *
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html
      */
     public function addSort($sort)
     {
@@ -170,11 +197,13 @@ public function addSort($sort)
     }
 
     /**
-     * Sets highlight arguments for the query
+     * Sets highlight arguments for the query.
+     *
+     * @param array $highlightArgs Set all highlight arguments
      *
-     * @param  array          $highlightArgs Set all highlight arguments
-     * @return \Elastica\Query Query object
-     * @link http://www.elasticsearch.org/guide/reference/api/search/highlighting.html
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-highlighting.html
      */
     public function setHighlight(array $highlightArgs)
     {
@@ -182,11 +211,13 @@ public function setHighlight(array $highlightArgs)
     }
 
     /**
-     * Adds a highlight argument
+     * Adds a highlight argument.
+     *
+     * @param mixed $highlight Add highlight argument
      *
-     * @param  mixed          $highlight Add highlight argument
-     * @return \Elastica\Query Query object
-     * @link http://www.elasticsearch.org/guide/reference/api/search/highlighting.html
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-highlighting.html
      */
     public function addHighlight($highlight)
     {
@@ -194,35 +225,41 @@ public function addHighlight($highlight)
     }
 
     /**
-     * Sets maximum number of results for this query
+     * Sets maximum number of results for this query.
+     *
+     * @param int $size OPTIONAL Maximal number of results for query (default = 10)
      *
-     * @param  int            $size OPTIONAL Maximal number of results for query (default = 10)
-     * @return \Elastica\Query Query object
+     * @return $this
      */
     public function setSize($size = 10)
     {
         return $this->setParam('size', $size);
-        
     }
 
     /**
-     * Alias for setSize
+     * Alias for setSize.
+     *
+     * @deprecated Use the setSize() method, this method will be removed in further Elastica releases
      *
-     * @deprecated Use the setSize() method, this method will be removed in future releases
-     * @param  int            $limit OPTIONAL Maximal number of results for query (default = 10)
-     * @return \Elastica\Query Query object
+     * @param int $limit OPTIONAL Maximal number of results for query (default = 10)
+     *
+     * @return $this
      */
     public function setLimit($limit = 10)
     {
+        trigger_error('Deprecated: Elastica\Query::setLimit() is deprecated. Use setSize method instead. This method will be removed in further Elastica releases.', E_USER_DEPRECATED);
+
         return $this->setSize($limit);
     }
 
     /**
-     * Enables explain on the query
+     * Enables explain on the query.
+     *
+     * @param bool $explain OPTIONAL Enabled or disable explain (default = true)
      *
-     * @param  bool           $explain OPTIONAL Enabled or disable explain (default = true)
-     * @return \Elastica\Query Current object
-     * @link http://www.elasticsearch.org/guide/reference/api/search/explain.html
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-explain.html
      */
     public function setExplain($explain = true)
     {
@@ -230,11 +267,13 @@ public function setExplain($explain = true)
     }
 
     /**
-     * Enables version on the query
+     * Enables version on the query.
+     *
+     * @param bool $version OPTIONAL Enabled or disable version (default = true)
+     *
+     * @return $this
      *
-     * @param  bool           $version OPTIONAL Enabled or disable version (default = true)
-     * @return \Elastica\Query Current object
-     * @link http://www.elasticsearch.org/guide/reference/api/search/version.html
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-version.html
      */
     public function setVersion($version = true)
     {
@@ -243,10 +282,14 @@ public function setVersion($version = true)
 
     /**
      * Sets the fields to be returned by the search
+     * NOTICE php will encode modified(or named keys) array into object format in json format request
+     * so the fields array must a sequence(list) type of array.
+     *
+     * @param array $fields Fields to be returned
+     *
+     * @return $this
      *
-     * @param  array          $fields Fields to be returned
-     * @return \Elastica\Query Current object
-     * @link http://www.elasticsearch.org/guide/reference/api/search/fields.html
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-fields.html
      */
     public function setFields(array $fields)
     {
@@ -254,67 +297,72 @@ public function setFields(array $fields)
     }
 
     /**
-     * Set script fields
+     * Sets the fields not stored to be returned by the search.
      *
-     * @param  array|\Elastica\ScriptFields $scriptFields Script fields
-     * @return \Elastica\Query              Current object
-     * @link http://www.elasticsearch.org/guide/reference/api/search/script-fields.html
+     * @param array $fieldDataFields Fields not stored to be returned
+     *
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-fielddata-fields.html
      */
-    public function setScriptFields($scriptFields)
+    public function setFieldDataFields(array $fieldDataFields)
     {
-        if (is_array($scriptFields)) {
-            $scriptFields = new ScriptFields($scriptFields);
-        }
-
-        return $this->setParam('script_fields', $scriptFields->toArray());
+        return $this->setParam('fielddata_fields', $fieldDataFields);
     }
 
     /**
-     * Adds a Script to the query
+     * Set script fields.
+     *
+     * @param array|\Elastica\Script\ScriptFields $scriptFields Script fields
+     *
+     * @return $this
      *
-     * @param  string          $name
-     * @param  \Elastica\Script $script Script object
-     * @return \Elastica\Query  Query object
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-script-fields.html
      */
-    public function addScriptField($name, Script $script)
+    public function setScriptFields($scriptFields)
     {
-        $this->_params['script_fields'][$name] = $script->toArray();
+        if (is_array($scriptFields)) {
+            $scriptFields = new ScriptFields($scriptFields);
+        }
 
-        return $this;
+        return $this->setParam('script_fields', $scriptFields);
     }
 
     /**
-     * Sets all facets for this query object. Replaces existing facets
+     * Adds a Script to the query.
      *
-     * @param  array          $facets List of facet objects
-     * @return \Elastica\Query Query object
-     * @link http://www.elasticsearch.org/guide/reference/api/search/facets/
+     * @param string                          $name
+     * @param \Elastica\Script\AbstractScript $script Script object
+     *
+     * @return $this
      */
-    public function setFacets(array $facets)
+    public function addScriptField($name, AbstractScript $script)
     {
-        $this->_params['facets'] = array();
-        foreach ($facets as $facet) {
-            $this->addFacet($facet);
-        }
+        $this->_params['script_fields'][$name] = $script;
 
         return $this;
     }
 
     /**
-     * Adds a Facet to the query
+     * Adds an Aggregation to the query.
+     *
+     * @param AbstractAggregation $agg
      *
-     * @param  \Elastica\Facet\AbstractFacet $facet Facet object
-     * @return \Elastica\Query               Query object
+     * @return $this
      */
-    public function addFacet(AbstractFacet $facet)
+    public function addAggregation(AbstractAggregation $agg)
     {
-        $this->_params['facets'][$facet->getName()] = $facet->toArray();
+        if (!array_key_exists('aggs', $this->_params)) {
+            $this->_params['aggs'] = array();
+        }
+
+        $this->_params['aggs'][] = $agg;
 
         return $this;
     }
 
     /**
-     * Converts all query params to an array
+     * Converts all query params to an array.
      *
      * @return array Query array
      */
@@ -324,15 +372,27 @@ public function toArray()
             $this->setQuery(new MatchAll());
         }
 
-        return $this->_params;
+        if (isset($this->_params['post_filter']) && 0 === count($this->_params['post_filter'])) {
+            unset($this->_params['post_filter']);
+        }
+
+        $array = $this->_convertArrayable($this->_params);
+
+        if (isset($array['suggest'])) {
+            $array['suggest'] = $array['suggest']['suggest'];
+        }
+
+        return $array;
     }
 
     /**
-     * Allows filtering of documents based on a minimum score
+     * Allows filtering of documents based on a minimum score.
+     *
+     * @param float $minScore Minimum score to filter documents by
      *
-     * @param  int                                 $minScore Minimum score to filter documents by
      * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Query                      Query object
+     *
+     * @return $this
      */
     public function setMinScore($minScore)
     {
@@ -344,16 +404,76 @@ public function setMinScore($minScore)
     }
 
     /**
-     * Add a suggest term
+     * Add a suggest term.
      *
-     * @param  \Elastica\Query          Query object
+     * @param \Elastica\Suggest $suggest suggestion object
+     *
+     * @return $this
      */
-    public function addSuggest($query)
+    public function setSuggest(Suggest $suggest)
     {
-        $this->addParam(NULL, $query->toArray());
+        $this->setParam('suggest', $suggest);
+
         $this->_suggest = 1;
+
+        return $this;
     }
-}
 
+    /**
+     * Add a Rescore.
+     *
+     * @param mixed $rescore suggestion object
+     *
+     * @return $this
+     */
+    public function setRescore($rescore)
+    {
+        if (is_array($rescore)) {
+            $buffer = array();
+
+            foreach ($rescore as $rescoreQuery) {
+                $buffer [] = $rescoreQuery;
+            }
+        } else {
+            $buffer = $rescore;
+        }
+
+        return $this->setParam('rescore', $buffer);
+    }
+
+    /**
+     * Sets the _source field to be returned with every hit.
+     *
+     * @param array|bool $params Fields to be returned or false to disable source
+     *
+     * @return $this
+     *
+     * @link   https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-source-filtering.html
+     */
+    public function setSource($params)
+    {
+        return $this->setParam('_source', $params);
+    }
 
+    /**
+     * Sets post_filter argument for the query. The filter is applied after the query has executed.
+     *
+     * @param array|\Elastica\Query\AbstractQuery $filter
+     *
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-post-filter.html
+     */
+    public function setPostFilter($filter)
+    {
+        if (is_array($filter)) {
+            trigger_error('Deprecated: Elastica\Query::setPostFilter() passing filter as array is deprecated. Pass instance of AbstractQuery instead.', E_USER_DEPRECATED);
+        } elseif ($filter instanceof AbstractFilter) {
+            trigger_error('Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', E_USER_DEPRECATED);
+        } elseif (!($filter instanceof AbstractQuery)) {
+            throw new InvalidException('Filter must be instance of AbstractQuery');
+        }
 
+        return $this->setParam('post_filter', $filter);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractGeoDistance.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractGeoDistance.php
new file mode 100755
index 0000000..f4cdb39
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractGeoDistance.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace Elastica\Query;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Geo distance query.
+ *
+ * @author Nicolas Ruflin <spam@ruflin.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-query.html
+ */
+abstract class AbstractGeoDistance extends AbstractQuery
+{
+    const LOCATION_TYPE_GEOHASH = 'geohash';
+    const LOCATION_TYPE_LATLON = 'latlon';
+
+    /**
+     * Location type.
+     *
+     * Decides if this query uses latitude/longitude or geohash for the location.
+     * Values are "latlon" or "geohash".
+     *
+     * @var string
+     */
+    protected $_locationType = null;
+
+    /**
+     * Key.
+     *
+     * @var string
+     */
+    protected $_key = null;
+
+    /**
+     * Latitude.
+     *
+     * @var float
+     */
+    protected $_latitude = null;
+
+    /**
+     * Longitude.
+     *
+     * @var float
+     */
+    protected $_longitude = null;
+
+    /**
+     * Geohash.
+     *
+     * @var string
+     */
+    protected $_geohash = null;
+
+    /**
+     * Create GeoDistance object.
+     *
+     * @param string       $key      Key
+     * @param array|string $location Location as array or geohash: array('lat' => 48.86, 'lon' => 2.35) OR 'drm3btev3e86'
+     *
+     * @internal param string $distance Distance
+     */
+    public function __construct($key, $location)
+    {
+        // Key
+        $this->setKey($key);
+        $this->setLocation($location);
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return $this
+     */
+    public function setKey($key)
+    {
+        $this->_key = $key;
+
+        return $this;
+    }
+
+    /**
+     * @param array|string $location
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
+     */
+    public function setLocation($location)
+    {
+        // Location
+        if (is_array($location)) { // Latitude/Longitude
+            // Latitude
+            if (isset($location['lat'])) {
+                $this->setLatitude($location['lat']);
+            } else {
+                throw new InvalidException('$location[\'lat\'] has to be set');
+            }
+
+            // Longitude
+            if (isset($location['lon'])) {
+                $this->setLongitude($location['lon']);
+            } else {
+                throw new InvalidException('$location[\'lon\'] has to be set');
+            }
+        } elseif (is_string($location)) { // Geohash
+            $this->setGeohash($location);
+        } else { // Invalid location
+            throw new InvalidException('$location has to be an array (latitude/longitude) or a string (geohash)');
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param float $latitude
+     *
+     * @return $this
+     */
+    public function setLatitude($latitude)
+    {
+        $this->_latitude = (float) $latitude;
+        $this->_locationType = self::LOCATION_TYPE_LATLON;
+
+        return $this;
+    }
+
+    /**
+     * @param float $longitude
+     *
+     * @return $this
+     */
+    public function setLongitude($longitude)
+    {
+        $this->_longitude = (float) $longitude;
+        $this->_locationType = self::LOCATION_TYPE_LATLON;
+
+        return $this;
+    }
+
+    /**
+     * @param string $geohash
+     *
+     * @return $this
+     */
+    public function setGeohash($geohash)
+    {
+        $this->_geohash = $geohash;
+        $this->_locationType = self::LOCATION_TYPE_GEOHASH;
+
+        return $this;
+    }
+
+    /**
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return array|string
+     */
+    protected function _getLocationData()
+    {
+        if ($this->_locationType === self::LOCATION_TYPE_LATLON) { // Latitude/longitude
+            $location = array();
+
+            if (isset($this->_latitude)) { // Latitude
+                $location['lat'] = $this->_latitude;
+            } else {
+                throw new InvalidException('Latitude has to be set');
+            }
+
+            if (isset($this->_longitude)) { // Geohash
+                $location['lon'] = $this->_longitude;
+            } else {
+                throw new InvalidException('Longitude has to be set');
+            }
+        } elseif ($this->_locationType === self::LOCATION_TYPE_GEOHASH) { // Geohash
+            $location = $this->_geohash;
+        } else { // Invalid location type
+            throw new InvalidException('Invalid location type');
+        }
+
+        return $location;
+    }
+
+    /**
+     * @see \Elastica\Param::toArray()
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $this->setParam($this->_key, $this->_getLocationData());
+
+        return parent::toArray();
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractGeoShape.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractGeoShape.php
new file mode 100755
index 0000000..76866ab
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractGeoShape.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * geo_shape query.
+ *
+ * Query pre-indexed shape definitions
+ *
+ * @author Bennie Krijger <benniekrijger@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html
+ */
+abstract class AbstractGeoShape extends AbstractQuery
+{
+    const RELATION_INTERSECT = 'intersects';
+    const RELATION_DISJOINT = 'disjoint';
+    const RELATION_CONTAINS = 'within';
+
+    /**
+     * @var string
+     *
+     * elasticsearch path of the pre-indexed shape
+     */
+    protected $_path;
+
+    /**
+     * @var string
+     *
+     * the relation of the 2 shaped: intersects, disjoint, within
+     */
+    protected $_relation = self::RELATION_INTERSECT;
+
+    /**
+     * @param string $relation
+     *
+     * @return $this
+     */
+    public function setRelation($relation)
+    {
+        $this->_relation = $relation;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRelation()
+    {
+        return $this->_relation;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractQuery.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractQuery.php
index 5b24ace..33ead51 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractQuery.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/AbstractQuery.php
@@ -1,13 +1,12 @@
 <?php
 
 namespace Elastica\Query;
+
 use Elastica\Param;
 
 /**
  * Abstract query object. Should be extended by all query types.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 abstract class AbstractQuery extends Param
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Bool.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Bool.php
index 2b2c115..2dff6b8 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Bool.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Bool.php
@@ -1,92 +1,19 @@
 <?php
 
 namespace Elastica\Query;
-use Elastica\Exception\InvalidException;
-use Elastica\Query\AbstractQuery;
+
+trigger_error('Elastica\Query\Bool is deprecated. Use BoolQuery instead. From PHP7 bool is reserved word and this class will be removed in further Elastica releases', E_USER_DEPRECATED);
 
 /**
- * Bool query
+ * Bool query.
+ *
+ * This class is for backward compatibility reason for all php < 7 versions. For PHP 7 and above use BoolQuery as Bool is reserved.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/bool-query.html
+ *
+ * @deprecated Use BoolQuery instead. From PHP7 bool is reserved word and this class will be removed in further Elastica releases
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-query.html
  */
-class Bool extends AbstractQuery
+class Bool extends BoolQuery
 {
-    /**
-     * Add should part to query
-     *
-     * @param  \Elastica\Query\AbstractQuery|array $args Should query
-     * @return \Elastica\Query\Bool           Current object
-     */
-    public function addShould($args)
-    {
-        return $this->_addQuery('should', $args);
-    }
-
-    /**
-     * Add must part to query
-     *
-     * @param  \Elastica\Query\AbstractQuery|array $args Must query
-     * @return \Elastica\Query\Bool           Current object
-     */
-    public function addMust($args)
-    {
-        return $this->_addQuery('must', $args);
-    }
-
-    /**
-     * Add must not part to query
-     *
-     * @param  \Elastica\Query\AbstractQuery|array $args Must not query
-     * @return \Elastica\Query\Bool           Current object
-     */
-    public function addMustNot($args)
-    {
-        return $this->_addQuery('must_not', $args);
-    }
-
-    /**
-     * Adds a query to the current object
-     *
-     * @param  string                              $type Query type
-     * @param  \Elastica\Query\AbstractQuery|array  $args Query
-     * @return \Elastica\Query\Bool
-     * @throws \Elastica\Exception\InvalidException If not valid query
-     */
-    protected function _addQuery($type, $args)
-    {
-        if ($args instanceof AbstractQuery) {
-            $args = $args->toArray();
-        }
-
-        if (!is_array($args)) {
-            throw new InvalidException('Invalid parameter. Has to be array or instance of Elastica\Query\AbstractQuery');
-        }
-
-        return $this->addParam($type, $args);
-    }
-
-    /**
-     * Sets boost value of this query
-     *
-     * @param  float               $boost Boost value
-     * @return \Elastica\Query\Bool Current object
-     */
-    public function setBoost($boost)
-    {
-        return $this->setParam('boost', $boost);
-    }
-
-    /**
-     * Set the minimum number of of should match
-     *
-     * @param  int                 $minimumNumberShouldMatch Should match minimum
-     * @return \Elastica\Query\Bool Current object
-     */
-    public function setMinimumNumberShouldMatch($minimumNumberShouldMatch)
-    {
-        return $this->setParam('minimum_number_should_match', $minimumNumberShouldMatch);
-    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/BoolQuery.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/BoolQuery.php
new file mode 100755
index 0000000..4e22479
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/BoolQuery.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Elastica\Query;
+
+use Elastica\Exception\InvalidException;
+use Elastica\Filter\AbstractFilter;
+
+/**
+ * Bool query.
+ *
+ * @author Nicolas Ruflin <spam@ruflin.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-query.html
+ */
+class BoolQuery extends AbstractQuery
+{
+    /**
+     * Add should part to query.
+     *
+     * @param \Elastica\Query\AbstractQuery|array $args Should query
+     *
+     * @return $this
+     */
+    public function addShould($args)
+    {
+        return $this->_addQuery('should', $args);
+    }
+
+    /**
+     * Add must part to query.
+     *
+     * @param \Elastica\Query\AbstractQuery|array $args Must query
+     *
+     * @return $this
+     */
+    public function addMust($args)
+    {
+        return $this->_addQuery('must', $args);
+    }
+
+    /**
+     * Add must not part to query.
+     *
+     * @param \Elastica\Query\AbstractQuery|array $args Must not query
+     *
+     * @return $this
+     */
+    public function addMustNot($args)
+    {
+        return $this->_addQuery('must_not', $args);
+    }
+
+    /**
+     * Sets the filter.
+     *
+     * @param \Elastica\Query\AbstractQuery $filter Filter object
+     *
+     * @return $this
+     */
+    public function addFilter($filter)
+    {
+        if ($filter instanceof AbstractFilter) {
+            trigger_error('Deprecated: Elastica\Query\BoolQuery::addFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+        } elseif (!($filter instanceof AbstractQuery)) {
+            throw new InvalidException('Filter must be instance of AbstractQuery');
+        }
+
+        return $this->addParam('filter', $filter);
+    }
+
+    /**
+     * Adds a query to the current object.
+     *
+     * @param string                              $type Query type
+     * @param \Elastica\Query\AbstractQuery|array $args Query
+     *
+     * @throws \Elastica\Exception\InvalidException If not valid query
+     *
+     * @return $this
+     */
+    protected function _addQuery($type, $args)
+    {
+        if (!is_array($args) && !($args instanceof AbstractQuery)) {
+            throw new InvalidException('Invalid parameter. Has to be array or instance of Elastica\Query\AbstractQuery');
+        }
+
+        return $this->addParam($type, $args);
+    }
+
+    /**
+     * Sets boost value of this query.
+     *
+     * @param float $boost Boost value
+     *
+     * @return $this
+     */
+    public function setBoost($boost)
+    {
+        return $this->setParam('boost', $boost);
+    }
+
+    /**
+     * Set the minimum number of of should match.
+     *
+     * @param int $minimumNumberShouldMatch Should match minimum
+     *
+     * @return $this
+     */
+    public function setMinimumNumberShouldMatch($minimumNumberShouldMatch)
+    {
+        return $this->setParam('minimum_number_should_match', $minimumNumberShouldMatch);
+    }
+
+    /**
+     * Converts array to an object in case no queries are added.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        if (empty($this->_params)) {
+            $this->_params = new \stdClass();
+        }
+
+        return parent::toArray();
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Boosting.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Boosting.php
new file mode 100755
index 0000000..47f6e96
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Boosting.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Class Boosting.
+ *
+ * @author Balazs Nadasdi <yitsushi@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-boosting-query.html
+ */
+class Boosting extends AbstractQuery
+{
+    const NEGATIVE_BOOST = 0.2;
+
+    /**
+     * Set the positive query for this Boosting Query.
+     *
+     * @param AbstractQuery $query
+     *
+     * @return $this
+     */
+    public function setPositiveQuery(AbstractQuery $query)
+    {
+        return $this->setParam('positive', $query);
+    }
+
+    /**
+     * Set the negative query for this Boosting Query.
+     *
+     * @param AbstractQuery $query
+     *
+     * @return $this
+     */
+    public function setNegativeQuery(AbstractQuery $query)
+    {
+        return $this->setParam('negative', $query);
+    }
+
+    /**
+     * Set the negative_boost parameter for this Boosting Query.
+     *
+     * @param float $negativeBoost
+     *
+     * @return $this
+     */
+    public function setNegativeBoost($negativeBoost)
+    {
+        return $this->setParam('negative_boost', (float) $negativeBoost);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Builder.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Builder.php
index 65a616c..249d984 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Builder.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Builder.php
@@ -1,15 +1,20 @@
 <?php
 
 namespace Elastica\Query;
+
 use Elastica\Exception\InvalidException;
+use Elastica\Exception\JSONParseException;
+use Elastica\JSON;
+
+trigger_error('This builder is deprecated and will be removed in further Elastica releases. Use new Elastica\QueryBuilder instead.', E_USER_DEPRECATED);
 
 /**
  * Query Builder.
  *
- * @category Xodoa
- * @package Elastica
  * @author Chris Gedrim <chris@gedr.im>
- * @link http://www.elasticsearch.org/
+ *
+ * @link https://www.elastic.co/
+ * @deprecated This builder is deprecated and will be removed in further Elastica releases. Use new Elastica\QueryBuilder instead.
  **/
 class Builder extends AbstractQuery
 {
@@ -25,21 +30,21 @@ class Builder extends AbstractQuery
      *
      * @param string $string JSON encoded string to use as query.
      *
-     * @return \Elastica\Query\Builder
+     * @return self
      */
     public static function factory($string = null)
     {
-        return new Builder($string);
+        return new self($string);
     }
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param string $string JSON encoded string to use as query.
      */
     public function __construct($string = null)
     {
-        if (! $string == null) {
+        if (!$string == null) {
             $this->_string .= substr($string, 1, -1);
         }
     }
@@ -59,21 +64,22 @@ public function __toString()
      */
     public function toArray()
     {
-        $array = json_decode($this->__toString(), true);
-
-        if (is_null($array)) {
-            throw new InvalidException('The query produced is invalid');
+        try {
+            return JSON::parse($input = $this->__toString());
+        } catch (JSONParseException $e) {
+            throw new InvalidException(sprintf(
+                'The produced query is not a valid json string : "%s"',
+                $input
+            ));
         }
-
-        return $array;
     }
 
     /**
      * Allow wildcards (*, ?) as the first character in a query.
      *
-     * @param boolean $bool Defaults to true.
+     * @param bool $bool Defaults to true.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function allowLeadingWildcard($bool = true)
     {
@@ -83,9 +89,9 @@ public function allowLeadingWildcard($bool = true)
     /**
      * Enable best effort analysis of wildcard terms.
      *
-     * @param boolean $bool Defaults to true.
+     * @param bool $bool Defaults to true.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function analyzeWildcard($bool = true)
     {
@@ -97,7 +103,7 @@ public function analyzeWildcard($bool = true)
      *
      * @param string $analyzer Analyzer to use.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function analyzer($analyzer)
     {
@@ -107,9 +113,9 @@ public function analyzer($analyzer)
     /**
      * Autogenerate phrase queries.
      *
-     * @param boolean $bool Defaults to true.
+     * @param bool $bool Defaults to true.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function autoGeneratePhraseQueries($bool = true)
     {
@@ -128,7 +134,7 @@ public function autoGeneratePhraseQueries($bool = true)
      *
      * The occurrence types are: must, should, must_not.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function bool()
     {
@@ -140,7 +146,7 @@ public function bool()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function boolClose()
     {
@@ -152,7 +158,7 @@ public function boolClose()
      *
      * @param float $boost Defaults to 1.0.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function boost($boost = 1.0)
     {
@@ -162,7 +168,7 @@ public function boost($boost = 1.0)
     /**
      * Close a previously opened brace.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function close()
     {
@@ -179,7 +185,7 @@ public function close()
      *
      * Maps to Lucene ConstantScoreQuery.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function constantScore()
     {
@@ -191,7 +197,7 @@ public function constantScore()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function constantScoreClose()
     {
@@ -203,7 +209,7 @@ public function constantScoreClose()
      *
      * @param string $field Defaults to _all.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function defaultField($field = '_all')
     {
@@ -219,7 +225,7 @@ public function defaultField($field = '_all')
      *
      * @param string $operator Defaults to OR.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function defaultOperator($operator = 'OR')
     {
@@ -234,7 +240,7 @@ public function defaultOperator($operator = 'OR')
      * produced by any subquery, plus a tie breaking increment for any additional
      * matching subqueries.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function disMax()
     {
@@ -246,7 +252,7 @@ public function disMax()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function disMaxClose()
     {
@@ -256,9 +262,9 @@ public function disMaxClose()
     /**
      * Enable position increments in result queries.
      *
-     * @param boolean $bool Defaults to true.
+     * @param bool $bool Defaults to true.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function enablePositionIncrements($bool = true)
     {
@@ -268,57 +274,27 @@ public function enablePositionIncrements($bool = true)
     /**
      * Enables explanation for each hit on how its score was computed.
      *
-     * @param boolean $value Turn on / off explain.
+     * @param bool $value Turn on / off explain.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function explain($value = true)
     {
         return $this->field('explain', $value);
     }
 
-    /**
-     * Open 'facets' block.
-     *
-     * Facets provide aggregated data based on a search query.
-     *
-     * In the simple case, a facet can return facet counts for various facet
-     * values for a specific field.
-     *
-     * ElasticSearch supports more advanced facet implementations, such as
-     * statistical or date histogram facets.
-     *
-     * @return \Elastica\Query\Builder
-     */
-    public function facets()
-    {
-        return $this->fieldOpen('facets');
-    }
-
-    /**
-     * Close a facets block.
-     *
-     * Alias of close() for ease of reading in source.
-     *
-     * @return \Elastica\Query\Builder
-     */
-    public function facetsClose()
-    {
-        return $this->close();
-    }
-
     /**
      * Add a specific field / value entry.
      *
      * @param string $name  Field to add.
      * @param mixed  $value Value to set.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function field($name, $value)
     {
         if (is_bool($value)) {
-            $value = '"'. var_export($value, true) . '"';
+            $value = '"'.var_export($value, true).'"';
         } elseif (is_array($value)) {
             $value = '["'.implode('","', $value).'"]';
         } else {
@@ -347,7 +323,7 @@ public function field($name, $value)
      *     ->rangeClose()
      *     ->queryClose();
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function fieldClose()
     {
@@ -359,7 +335,7 @@ public function fieldClose()
      *
      * @param string $name Field name.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function fieldOpen($name)
     {
@@ -374,7 +350,7 @@ public function fieldOpen($name)
      *
      * @param array $fields Array of fields to return.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function fields(array $fields)
     {
@@ -392,7 +368,7 @@ public function fields(array $fields)
     /**
      * Open a 'filter' block.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function filter()
     {
@@ -402,7 +378,7 @@ public function filter()
     /**
      * Close a filter block.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function filterClose()
     {
@@ -412,7 +388,7 @@ public function filterClose()
     /**
      *  Query.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function filteredQuery()
     {
@@ -424,7 +400,7 @@ public function filteredQuery()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function filteredQueryClose()
     {
@@ -434,9 +410,9 @@ public function filteredQueryClose()
     /**
      * Set the from parameter (offset).
      *
-     * @param integer $value Result number to start from.
+     * @param int $value Result number to start from.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function from($value = 0)
     {
@@ -448,7 +424,7 @@ public function from($value = 0)
      *
      * @param float $value Defaults to 0.5.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function fuzzyMinSim($value = 0.5)
     {
@@ -458,9 +434,9 @@ public function fuzzyMinSim($value = 0.5)
     /**
      * Set the prefix length for fuzzy queries.
      *
-     * @param integer $value Defaults to 0.
+     * @param int $value Defaults to 0.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function fuzzyPrefixLength($value = 0)
     {
@@ -474,7 +450,7 @@ public function fuzzyPrefixLength($value = 0)
      *
      * @param mixed $value Value to be gt.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function gt($value)
     {
@@ -488,7 +464,7 @@ public function gt($value)
      *
      * @param mixed $value Value to be gte to.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function gte($value)
     {
@@ -498,9 +474,9 @@ public function gte($value)
     /**
      * Automatically lower-case terms of wildcard, prefix, fuzzy, and range queries.
      *
-     * @param boolean $bool Defaults to true.
+     * @param bool $bool Defaults to true.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function lowercaseExpandedTerms($bool = true)
     {
@@ -514,7 +490,7 @@ public function lowercaseExpandedTerms($bool = true)
      *
      * @param mixed $value Value to be lt.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function lt($value)
     {
@@ -528,7 +504,7 @@ public function lt($value)
      *
      * @param mixed $value Value to be lte to.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function lte($value)
     {
@@ -544,13 +520,13 @@ public function lte($value)
      *
      * @param float $boost Boost to use.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function matchAll($boost = null)
     {
         $this->fieldOpen('match_all');
 
-        if ( ! $boost == null && is_numeric($boost)) {
+        if (!$boost == null && is_numeric($boost)) {
             $this->field('boost', (float) $boost);
         }
 
@@ -560,9 +536,9 @@ public function matchAll($boost = null)
     /**
      * The minimum number of should clauses to match.
      *
-     * @param integer $minimum Minimum number that should match.
+     * @param int $minimum Minimum number that should match.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function minimumNumberShouldMatch($minimum)
     {
@@ -572,7 +548,7 @@ public function minimumNumberShouldMatch($minimum)
     /**
      * The clause (query) must appear in matching documents.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function must()
     {
@@ -584,7 +560,7 @@ public function must()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function mustClose()
     {
@@ -597,7 +573,7 @@ public function mustClose()
      * Note that it is not possible to search on documents that only consists of
      * a must_not clauses.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function mustNot()
     {
@@ -609,7 +585,7 @@ public function mustNot()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function mustNotClose()
     {
@@ -619,7 +595,7 @@ public function mustNotClose()
     /**
      * Add an opening brace.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function open()
     {
@@ -633,9 +609,9 @@ public function open()
      *
      * If zero, then exact phrase matches are required.
      *
-     * @param integer $value Defaults to 0.
+     * @param int $value Defaults to 0.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function phraseSlop($value = 0)
     {
@@ -645,7 +621,7 @@ public function phraseSlop($value = 0)
     /**
      *  Query.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function prefix()
     {
@@ -657,7 +633,7 @@ public function prefix()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function prefixClose()
     {
@@ -669,7 +645,7 @@ public function prefixClose()
      *
      * @param array $queries Array of queries.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function queries(array $queries)
     {
@@ -687,7 +663,7 @@ public function queries(array $queries)
     /**
      * Open a query block.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function query()
     {
@@ -699,7 +675,7 @@ public function query()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function queryClose()
     {
@@ -711,7 +687,7 @@ public function queryClose()
      *
      * A query that uses a query parser in order to parse its content
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function queryString()
     {
@@ -723,7 +699,7 @@ public function queryString()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function queryStringClose()
     {
@@ -733,7 +709,7 @@ public function queryStringClose()
     /**
      * Open a range block.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function range()
     {
@@ -745,7 +721,7 @@ public function range()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function rangeClose()
     {
@@ -758,7 +734,7 @@ public function rangeClose()
      * A boolean query with no must clauses, one or more should clauses must
      * match a document.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function should()
     {
@@ -770,7 +746,7 @@ public function should()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function shouldClose()
     {
@@ -780,9 +756,9 @@ public function shouldClose()
     /**
      * Set the size parameter (number of records to return).
      *
-     * @param integer $value Number of records to return.
+     * @param int $value Number of records to return.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function size($value = 10)
     {
@@ -792,7 +768,7 @@ public function size($value = 10)
     /**
      * Allows to add one or more sort on specific fields.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function sort()
     {
@@ -804,7 +780,7 @@ public function sort()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function sortClose()
     {
@@ -814,10 +790,10 @@ public function sortClose()
     /**
      * Add a field to sort on.
      *
-     * @param string  $name    Field to sort.
-     * @param boolean $reverse Reverse direction.
+     * @param string $name    Field to sort.
+     * @param bool   $reverse Reverse direction.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function sortField($name, $reverse = false)
     {
@@ -830,12 +806,12 @@ public function sortField($name, $reverse = false)
     }
 
     /**
-     * Sort on multiple fields
+     * Sort on multiple fields.
      *
      * @param array $fields Associative array where the keys are field names to sort on, and the
      *                      values are the sort order: "asc" or "desc"
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function sortFields(array $fields)
     {
@@ -845,7 +821,7 @@ public function sortFields(array $fields)
             $this->_string .= '{"'.$fieldName.'":"'.$order.'"},';
         }
 
-        $this->_string = rtrim($this->_string, ',') . '],';
+        $this->_string = rtrim($this->_string, ',').'],';
 
         return $this;
     }
@@ -857,7 +833,7 @@ public function sortFields(array $fields)
      *
      * The term query maps to Lucene TermQuery.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function term()
     {
@@ -869,7 +845,7 @@ public function term()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function termClose()
     {
@@ -879,7 +855,7 @@ public function termClose()
     /**
      * Open a 'text_phrase' block.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function textPhrase()
     {
@@ -889,7 +865,7 @@ public function textPhrase()
     /**
      * Close a 'text_phrase' block.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function textPhraseClose()
     {
@@ -901,7 +877,7 @@ public function textPhraseClose()
      *
      * @param float $multiplier Multiplier to use.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function tieBreakerMultiplier($multiplier)
     {
@@ -911,7 +887,7 @@ public function tieBreakerMultiplier($multiplier)
     /**
      *  Query.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function wildcard()
     {
@@ -923,7 +899,7 @@ public function wildcard()
      *
      * Alias of close() for ease of reading in source.
      *
-     * @return \Elastica\Query\Builder
+     * @return $this
      */
     public function wildcardClose()
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Common.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Common.php
index 6e11276..942bd5c 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Common.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Common.php
@@ -2,11 +2,10 @@
 
 namespace Elastica\Query;
 
-
 /**
- * Class Common
- * @package Elastica
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/common-terms-query/
+ * Class Common.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-common-terms-query.html
  */
 class Common extends AbstractQuery
 {
@@ -24,9 +23,9 @@ class Common extends AbstractQuery
     protected $_queryParams = array();
 
     /**
-     * @param string $field the field on which to query
-     * @param string $query the query string
-     * @param float $cutoffFrequency percentage in decimal form (.001 == 0.1%)
+     * @param string $field           the field on which to query
+     * @param string $query           the query string
+     * @param float  $cutoffFrequency percentage in decimal form (.001 == 0.1%)
      */
     public function __construct($field, $query, $cutoffFrequency)
     {
@@ -36,20 +35,25 @@ public function __construct($field, $query, $cutoffFrequency)
     }
 
     /**
-     * Set the field on which to query
+     * Set the field on which to query.
+     *
      * @param string $field the field on which to query
-     * @return \Elastica\Query\Common
+     *
+     * @return $this
      */
     public function setField($field)
     {
         $this->_field = $field;
+
         return $this;
     }
 
     /**
-     * Set the query string for this query
+     * Set the query string for this query.
+     *
      * @param string $query
-     * @return \Elastica\Query\Common
+     *
+     * @return $this
      */
     public function setQuery($query)
     {
@@ -57,19 +61,23 @@ public function setQuery($query)
     }
 
     /**
-     * Set the frequency below which terms will be put in the low frequency group
+     * Set the frequency below which terms will be put in the low frequency group.
+     *
      * @param float $frequency percentage in decimal form (.001 == 0.1%)
-     * @return \Elastica\Query\Common
+     *
+     * @return $this
      */
     public function setCutoffFrequency($frequency)
     {
-        return $this->setQueryParam('cutoff_frequency', (float)$frequency);
+        return $this->setQueryParam('cutoff_frequency', (float) $frequency);
     }
 
     /**
-     * Set the logic operator for low frequency terms
+     * Set the logic operator for low frequency terms.
+     *
      * @param string $operator see OPERATOR_* class constants for options
-     * @return \Elastica\Query\Common
+     *
+     * @return $this
      */
     public function setLowFrequencyOperator($operator)
     {
@@ -77,9 +85,11 @@ public function setLowFrequencyOperator($operator)
     }
 
     /**
-     * Set the logic operator for high frequency terms
+     * Set the logic operator for high frequency terms.
+     *
      * @param string $operator see OPERATOR_* class constants for options
-     * @return \Elastica\Query\Common
+     *
+     * @return $this
      */
     public function setHighFrequencyOperator($operator)
     {
@@ -87,10 +97,13 @@ public function setHighFrequencyOperator($operator)
     }
 
     /**
-     * Set the minimum_should_match parameter
+     * Set the minimum_should_match parameter.
+     *
      * @param int|string $minimum minimum number of low frequency terms which must be present
-     * @return \Elastica\Query\Common
-     * @link Possible values for minimum_should_match http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html
+     *
+     * @return $this
+     *
+     * @link Possible values for minimum_should_match https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html
      */
     public function setMinimumShouldMatch($minimum)
     {
@@ -98,19 +111,23 @@ public function setMinimumShouldMatch($minimum)
     }
 
     /**
-     * Set the boost for this query
+     * Set the boost for this query.
+     *
      * @param float $boost
-     * @return \Elastica\Query\Common
+     *
+     * @return $this
      */
     public function setBoost($boost)
     {
-        return $this->setQueryParam('boost', (float)$boost);
+        return $this->setQueryParam('boost', (float) $boost);
     }
 
     /**
-     * Set the analyzer for this query
+     * Set the analyzer for this query.
+     *
      * @param string $analyzer
-     * @return \Elastica\Query\Common
+     *
+     * @return $this
      */
     public function setAnalyzer($analyzer)
     {
@@ -118,24 +135,29 @@ public function setAnalyzer($analyzer)
     }
 
     /**
-     * Enable / disable computation of score factor based on the fraction of all query terms contained in the document
+     * Enable / disable computation of score factor based on the fraction of all query terms contained in the document.
+     *
      * @param bool $disable disable_coord is false by default
-     * @return \Elastica\Query\Common
+     *
+     * @return $this
      */
     public function setDisableCoord($disable = true)
     {
-        return $this->setQueryParam('disable_coord', (bool)$disable);
+        return $this->setQueryParam('disable_coord', (bool) $disable);
     }
 
     /**
-     * Set a parameter in the body of this query
-     * @param string $key parameter key
-     * @param mixed $value parameter value
-     * @return \Elastica\Query\Common
+     * Set a parameter in the body of this query.
+     *
+     * @param string $key   parameter key
+     * @param mixed  $value parameter value
+     *
+     * @return $this
      */
     public function setQueryParam($key, $value)
     {
         $this->_queryParams[$key] = $value;
+
         return $this;
     }
 
@@ -145,6 +167,7 @@ public function setQueryParam($key, $value)
     public function toArray()
     {
         $this->setParam($this->_field, $this->_queryParams);
+
         return parent::toArray();
     }
-}
\ No newline at end of file
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/ConstantScore.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/ConstantScore.php
index 69cff5a..934231f 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/ConstantScore.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/ConstantScore.php
@@ -1,50 +1,79 @@
 <?php
 
 namespace Elastica\Query;
+
+use Elastica\Exception\InvalidException;
 use Elastica\Filter\AbstractFilter;
 
 /**
- * Constant score query
+ * Constant score query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/constant-score-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-constant-score-query.html
  */
 class ConstantScore extends AbstractQuery
 {
     /**
-     * Construct constant score query
+     * Construct constant score query.
      *
-     * @param null|\Elastica\Filter\AbstractFilter|array $filter
+     * @param null|\Elastica\Query\AbstractQuery|array $filter
      */
     public function __construct($filter = null)
     {
         if (!is_null($filter)) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\ConstantScore passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!is_array($filter) && !($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+
             $this->setFilter($filter);
         }
     }
 
     /**
-     * Set filter
+     * Set filter.
+     *
+     * @param array|\Elastica\Query\AbstractQuery $filter
      *
-     * @param  array|\Elastica\Filter\AbstractFilter $filter
-     * @return \Elastica\Query\ConstantScore         Query object
+     * @return $this
      */
     public function setFilter($filter)
     {
         if ($filter instanceof AbstractFilter) {
-            $filter = $filter->toArray();
+            trigger_error('Deprecated: Elastica\Query\ConstantScore::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+        } elseif (!is_array($filter) && !($filter instanceof AbstractQuery)) {
+            throw new InvalidException('Filter must be instance of AbstractQuery or array');
         }
 
         return $this->setParam('filter', $filter);
     }
 
     /**
-     * Set boost
+     * Set query.
+     *
+     * @param array|\Elastica\Query\AbstractQuery $query
+     *
+     * @throws InvalidException If query is not an array or instance of AbstractQuery
+     *
+     * @return $this
+     */
+    public function setQuery($query)
+    {
+        if (!is_array($query) && !($query instanceof AbstractQuery)) {
+            throw new InvalidException('Invalid parameter. Has to be array or instance of Elastica\Query\AbstractQuery');
+        }
+
+        return $this->setParam('query', $query);
+    }
+
+    /**
+     * Set boost.
+     *
+     * @param float $boost
      *
-     * @param  float                        $boost
-     * @return \Elastica\Query\ConstantScore
+     * @return $this
      */
     public function setBoost($boost)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/DisMax.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/DisMax.php
new file mode 100755
index 0000000..7b9a5a4
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/DisMax.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Elastica\Query;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * DisMax query.
+ *
+ * @author Hung Tran <oohnoitz@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-dis-max-query.html
+ */
+class DisMax extends AbstractQuery
+{
+    /**
+     * Adds a query to the current object.
+     *
+     * @param \Elastica\Query\AbstractQuery|array $args Query
+     *
+     * @throws \Elastica\Exception\InvalidException If not valid query
+     *
+     * @return $this
+     */
+    public function addQuery($args)
+    {
+        if (!is_array($args) && !($args instanceof AbstractQuery)) {
+            throw new InvalidException('Invalid parameter. Has to be array or instance of Elastica\Query\AbstractQuery');
+        }
+
+        return $this->addParam('queries', $args);
+    }
+
+    /**
+     * Set boost.
+     *
+     * @param float $boost
+     *
+     * @return $this
+     */
+    public function setBoost($boost)
+    {
+        return $this->setParam('boost', $boost);
+    }
+
+    /**
+     * Sets tie breaker to multiplier value to balance the scores between lower and higher scoring fields.
+     *
+     * If not set, defaults to 0.0
+     *
+     * @param float $tieBreaker
+     *
+     * @return $this
+     */
+    public function setTieBreaker($tieBreaker = 0.0)
+    {
+        return $this->setParam('tie_breaker', $tieBreaker);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Exists.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Exists.php
new file mode 100755
index 0000000..9a85c45
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Exists.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Exists query.
+ *
+ * @author Oleg Cherniy <oleg.cherniy@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-query.html
+ */
+class Exists extends AbstractQuery
+{
+    /**
+     * Construct exists query.
+     *
+     * @param string $field
+     */
+    public function __construct($field)
+    {
+        $this->setField($field);
+    }
+
+    /**
+     * Set field.
+     *
+     * @param string $field
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', $field);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Filtered.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Filtered.php
index 74a4c80..31dff33 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Filtered.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Filtered.php
@@ -1,78 +1,84 @@
 <?php
 
 namespace Elastica\Query;
+
+use Elastica\Exception\InvalidException;
 use Elastica\Filter\AbstractFilter;
 
+trigger_error('Use BoolQuery instead. Filtered query is deprecated since ES 2.0.0-beta1 and this class will be removed in further Elastica releases.', E_USER_DEPRECATED);
+
 /**
- * Filtered query. Needs a query and a filter
+ * Filtered query. Needs a query and a filter.
+ *
+ * @deprecated Use BoolQuery instead. Filtered query is deprecated since ES 2.0.0-beta1 and this class will be removed in further Elastica releases.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/filtered-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-filtered-query.html
  */
 class Filtered extends AbstractQuery
 {
     /**
-     * Query
-     *
-     * @var \Elastica\Query\AbstractQuery Query object
-     */
-    protected $_query = null;
-
-    /**
-     * Filter
-     *
-     * @var \Elastica\Filter\AbstractFilter Filter object
-     */
-    protected $_filter = null;
-
-    /**
-     * Constructs a filtered query
+     * Constructs a filtered query.
      *
-     * @param \Elastica\Query\AbstractQuery   $query  Query object
-     * @param \Elastica\Filter\AbstractFilter $filter Filter object
+     * @param \Elastica\Query\AbstractQuery $query  OPTIONAL Query object
+     * @param \Elastica\Query\AbstractQuery $filter OPTIONAL Filter object
      */
-    public function __construct(AbstractQuery $query, AbstractFilter $filter)
+    public function __construct(AbstractQuery $query = null, $filter = null)
     {
         $this->setQuery($query);
+
+        if (null !== $filter) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\Filtered passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+        }
+
         $this->setFilter($filter);
     }
 
     /**
-     * Sets a query
+     * Sets a query.
      *
-     * @param  \Elastica\Query\AbstractQuery $query Query object
-     * @return \Elastica\Query\Filtered      Current object
+     * @param \Elastica\Query\AbstractQuery $query Query object
+     *
+     * @return $this
      */
-    public function setQuery(AbstractQuery $query)
+    public function setQuery(AbstractQuery $query = null)
     {
-        $this->_query = $query;
-
-        return $this;
+        return $this->setParam('query', $query);
     }
 
     /**
-     * Sets the filter
+     * Sets the filter.
+     *
+     * @param \Elastica\Query\AbstractQuery $filter Filter object
      *
-     * @param  \Elastica\Filter\AbstractFilter $filter Filter object
-     * @return \Elastica\Query\Filtered        Current object
+     * @return $this
      */
-    public function setFilter(AbstractFilter $filter)
+    public function setFilter($filter = null)
     {
-        $this->_filter = $filter;
+        if (null !== $filter) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\Filtered::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+        }
 
-        return $this;
+        return $this->setParam('filter', $filter);
     }
 
     /**
      * Gets the filter.
      *
-     * @return \Elastica\Filter\AbstractFilter
+     * @return \Elastica\Query\AbstractQuery|\Elastica\Filter\AbstractFilter
      */
     public function getFilter()
     {
-        return $this->_filter;
+        return $this->getParam('filter');
     }
 
     /**
@@ -82,20 +88,32 @@ public function getFilter()
      */
     public function getQuery()
     {
-        return $this->_query;
+        return $this->getParam('query');
     }
 
     /**
-     * Converts query to array
+     * Converts query to array.
      *
      * @return array Query array
+     *
      * @see \Elastica\Query\AbstractQuery::toArray()
      */
     public function toArray()
     {
-        return array('filtered' => array(
-            'query' => $this->_query->toArray(),
-            'filter' => $this->_filter->toArray()
-        ));
+        $filtered = array();
+
+        if ($this->hasParam('query') && $this->getParam('query') instanceof AbstractQuery) {
+            $filtered['query'] = $this->getParam('query')->toArray();
+        }
+
+        if ($this->hasParam('filter') && ($this->getParam('filter') instanceof AbstractQuery || $this->getParam('filter') instanceof AbstractFilter)) {
+            $filtered['filter'] = $this->getParam('filter')->toArray();
+        }
+
+        if (empty($filtered)) {
+            throw new InvalidException('A query and/or filter is required');
+        }
+
+        return array('filtered' => $filtered);
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/FunctionScore.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/FunctionScore.php
index 2d99dd8..44e5328 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/FunctionScore.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/FunctionScore.php
@@ -1,20 +1,23 @@
 <?php
 
 namespace Elastica\Query;
+
+use Elastica\Exception\DeprecatedException;
+use Elastica\Exception\InvalidException;
 use Elastica\Filter\AbstractFilter;
-use Elastica\Script;
+use Elastica\Script\AbstractScript;
 
 /**
- * Class FunctionScore
- * @package Elastica\Query
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/function-score-query/
+ * Class FunctionScore.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-function-score-query.html
  */
 class FunctionScore extends AbstractQuery
 {
     const BOOST_MODE_MULTIPLY = 'multiply';
     const BOOST_MODE_REPLACE = 'replace';
     const BOOST_MODE_SUM = 'sum';
-    const BOOST_MODE_AVERAGE = 'average';
+    const BOOST_MODE_AVERAGE = 'avg';
     const BOOST_MODE_MAX = 'max';
     const BOOST_MODE_MIN = 'min';
 
@@ -25,124 +28,276 @@ class FunctionScore extends AbstractQuery
     const SCORE_MODE_MAX = 'max';
     const SCORE_MODE_MIN = 'min';
 
-    const DECAY_GUASS = 'gauss';
+    const DECAY_GAUSS = 'gauss';
     const DECAY_EXPONENTIAL = 'exp';
     const DECAY_LINEAR = 'linear';
 
+    const FIELD_VALUE_FACTOR_MODIFIER_NONE = 'none';
+    const FIELD_VALUE_FACTOR_MODIFIER_LOG = 'log';
+    const FIELD_VALUE_FACTOR_MODIFIER_LOG1P = 'log1p';
+    const FIELD_VALUE_FACTOR_MODIFIER_LOG2P = 'log2p';
+    const FIELD_VALUE_FACTOR_MODIFIER_LN = 'ln';
+    const FIELD_VALUE_FACTOR_MODIFIER_LN1P = 'ln1p';
+    const FIELD_VALUE_FACTOR_MODIFIER_LN2P = 'ln2p';
+    const FIELD_VALUE_FACTOR_MODIFIER_SQUARE = 'square';
+    const FIELD_VALUE_FACTOR_MODIFIER_SQRT = 'sqrt';
+    const FIELD_VALUE_FACTOR_MODIFIER_RECIPROCAL = 'reciprocal';
+
     protected $_functions = array();
 
     /**
-     * Set the child query for this function_score query
+     * Set the child query for this function_score query.
+     *
      * @param AbstractQuery $query
-     * @return \Elastica\Query\FunctionScore
+     *
+     * @return $this
      */
     public function setQuery(AbstractQuery $query)
     {
-        return $this->setParam('query', $query->toArray());
+        return $this->setParam('query', $query);
     }
 
     /**
      * @param AbstractFilter $filter
-     * @return \Elastica\Param
+     *
+     * @deprecated Elastica\Query\FunctionScore::setFilter is deprecated. Use setQuery instead
+     *
+     * @return $this
      */
     public function setFilter(AbstractFilter $filter)
     {
-        return $this->setParam('filter', $filter->toArray());
+        throw new DeprecatedException('Deprecated: Elastica\Query\FunctionScore::setFilter is deprecated. Use setQuery instead.');
     }
 
     /**
-     * Add a function to the function_score query
-     * @param string $functionType valid values are DECAY_* constants and script_score
-     * @param array $functionParams the body of the function. See documentation for proper syntax.
-     * @param AbstractFilter $filter optional filter to apply to the function
-     * @param float $boost optional boost value associated with the function
-     * @return \Elastica\Query\FunctionScore
+     * Add a function to the function_score query.
+     *
+     * @param string        $functionType   valid values are DECAY_* constants and script_score
+     * @param array|float   $functionParams the body of the function. See documentation for proper syntax.
+     * @param AbstractQuery $filter         optional filter to apply to the function
+     * @param float         $weight         function weight
+     *
+     * @return $this
      */
-    public function addFunction($functionType, array $functionParams, AbstractFilter $filter = NULL, $boost = NULL)
+    public function addFunction($functionType, $functionParams, $filter = null, $weight = null)
     {
         $function = array(
-            $functionType => $functionParams
+            $functionType => $functionParams,
         );
+
         if (!is_null($filter)) {
-            $function['filter'] = $filter->toArray();
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+
+            $function['filter'] = $filter;
         }
-        if (!is_null($boost)) {
-            $function['boost'] = $boost;
+
+        if ($weight !== null) {
+            $function['weight'] = $weight;
         }
+
         $this->_functions[] = $function;
+
         return $this;
     }
 
     /**
-     * Add a script_score function to the query
-     * @param Script $script a Script object
-     * @param AbstractFilter $filter an optional filter to apply to the function
-     * @param float $boost optional boost avlue associated with this function
-     * @return \Elastica\Query\FunctionScore
+     * Add a script_score function to the query.
+     *
+     * @param \Elastica\Script\AbstractScript $script a Script object
+     * @param AbstractQuery                   $filter an optional filter to apply to the function
+     * @param float                           $weight the weight of the function
+     *
+     * @return $this
      */
-    public function addScriptScoreFunction(Script $script, AbstractFilter $filter = NULL, $boost = NULL)
+    public function addScriptScoreFunction(AbstractScript $script, $filter = null, $weight = null)
     {
-        return $this->addFunction('script_score', $script->toArray(), $filter, $boost);
+        if (null !== $filter) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\FunctionScore::addScriptScoreFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+        }
+
+        return $this->addFunction('script_score', $script, $filter, $weight);
     }
 
     /**
-     * Add a decay function to the query
-     * @param string $function see DECAY_* constants for valid options
-     * @param string $field the document field on which to perform the decay function
-     * @param string $origin the origin value for this decay function
-     * @param string $scale a scale to define the rate of decay for this function
-     * @param string $offset If defined, this function will only be computed for documents with a distance from the origin greater than this value
-     * @param float $decay optionally defines how documents are scored at the distance given by the $scale parameter
-     * @param float $scaleWeight optional factor by which to multiply the score at the value provided by the $scale parameter
-     * @param AbstractFilter $filter a filter associated with this function
-     * @param float $boost an optional boost value associated with this function
-     * @return \Elastica\Query\FunctionScore
+     * Add a decay function to the query.
+     *
+     * @param string        $function see DECAY_* constants for valid options
+     * @param string        $field    the document field on which to perform the decay function
+     * @param string        $origin   the origin value for this decay function
+     * @param string        $scale    a scale to define the rate of decay for this function
+     * @param string        $offset   If defined, this function will only be computed for documents with a distance from the origin greater than this value
+     * @param float         $decay    optionally defines how documents are scored at the distance given by the $scale parameter
+     * @param float         $weight   optional factor by which to multiply the score at the value provided by the $scale parameter
+     * @param AbstractQuery $filter   a filter associated with this function
+     *
+     * @return $this
      */
-    public function addDecayFunction($function, $field, $origin, $scale, $offset = NULL, $decay = NULL, $scaleWeight = NULL,
-                                     AbstractFilter $filter = NULL, $boost = NULL)
-    {
+    public function addDecayFunction(
+        $function,
+        $field,
+        $origin,
+        $scale,
+        $offset = null,
+        $decay = null,
+        $weight = null,
+        $filter = null
+    ) {
+        if (null !== $filter) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\FunctionScore::addDecayFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+        }
+
         $functionParams = array(
             $field => array(
                 'origin' => $origin,
-                'scale' => $scale
-            )
+                'scale' => $scale,
+            ),
         );
         if (!is_null($offset)) {
             $functionParams[$field]['offset'] = $offset;
         }
         if (!is_null($decay)) {
-            $functionParams[$field]['decay'] = (float)$decay;
+            $functionParams[$field]['decay'] = (float) $decay;
         }
-        if (!is_null($scaleWeight)) {
-            $functionParams[$field]['scale_weight'] = (float)$scaleWeight;
+
+        return $this->addFunction($function, $functionParams, $filter, $weight);
+    }
+
+    public function addFieldValueFactorFunction(
+        $field,
+        $factor = null,
+        $modifier = null,
+        $missing = null,
+        $weight = null,
+        $filter = null
+    ) {
+        if (null !== $filter) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\FunctionScore::addFieldValueFactorFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
         }
-        return $this->addFunction($function, $functionParams, $filter, $boost);
+
+        $functionParams = array(
+            'field' => $field,
+        );
+
+        if (!is_null($factor)) {
+            $functionParams['factor'] = $factor;
+        }
+
+        if (!is_null($modifier)) {
+            $functionParams['modifier'] = $modifier;
+        }
+
+        if (!is_null($missing)) {
+            $functionParams['missing'] = $missing;
+        }
+
+        return $this->addFunction('field_value_factor', $functionParams, $filter, $weight);
     }
 
     /**
-     * Set an overall boost value for this query
+     * Add a boost_factor function to the query.
+     *
+     * @param float         $boostFactor the boost factor value
+     * @param AbstractQuery $filter      a filter associated with this function
+     *
+     * @deprecated Use addWeightFunction instead. This method will be removed in further Elastica releases
+     */
+    public function addBoostFactorFunction($boostFactor, $filter = null)
+    {
+        if (null !== $filter) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\FunctionScore::addBoostFactorFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+        }
+
+        trigger_error('Query\FunctionScore::addBoostFactorFunction is deprecated. Use addWeightFunction instead. This method will be removed in further Elastica releases', E_USER_DEPRECATED);
+        $this->addWeightFunction($boostFactor, $filter);
+    }
+
+    /**
+     * @param float         $weight the weight of the function
+     * @param AbstractQuery $filter a filter associated with this function
+     */
+    public function addWeightFunction($weight, $filter = null)
+    {
+        if (null !== $filter) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\FunctionScore::addWeightFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+        }
+
+        $this->addFunction('weight', $weight, $filter);
+    }
+
+    /**
+     * Add a random_score function to the query.
+     *
+     * @param number        $seed   the seed value
+     * @param AbstractQuery $filter a filter associated with this function
+     * @param float         $weight an optional boost value associated with this function
+     */
+    public function addRandomScoreFunction($seed, $filter = null, $weight = null)
+    {
+        if (null !== $filter) {
+            if ($filter instanceof AbstractFilter) {
+                trigger_error('Deprecated: Elastica\Query\FunctionScore::addRandomScoreFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', E_USER_DEPRECATED);
+            } elseif (!($filter instanceof AbstractQuery)) {
+                throw new InvalidException('Filter must be instance of AbstractQuery');
+            }
+        }
+
+        $this->addFunction('random_score', array('seed' => $seed), $filter, $weight);
+    }
+
+    /**
+     * Set an overall boost value for this query.
+     *
      * @param float $boost
-     * @return \Elastica\Query\FunctionScore
+     *
+     * @return $this
      */
     public function setBoost($boost)
     {
-        return $this->setParam('boost', (float)$boost);
+        return $this->setParam('boost', (float) $boost);
     }
 
     /**
-     * Restrict the combined boost of the function_score query and its child query
+     * Restrict the combined boost of the function_score query and its child query.
+     *
      * @param float $maxBoost
-     * @return \Elastica\Query\FunctionScore
+     *
+     * @return $this
      */
     public function setMaxBoost($maxBoost)
     {
-        return $this->setParam('max_boost', (float)$maxBoost);
+        return $this->setParam('max_boost', (float) $maxBoost);
     }
 
     /**
-     * The boost mode determines how the score of this query is combined with that of the child query
+     * The boost mode determines how the score of this query is combined with that of the child query.
+     *
      * @param string $mode see BOOST_MODE_* constants for valid options. Default is multiply.
-     * @return \Elastica\Query\FunctionScore
+     *
+     * @return $this
      */
     public function setBoostMode($mode)
     {
@@ -151,28 +306,45 @@ public function setBoostMode($mode)
 
     /**
      * If set, this query will return results in random order.
+     *
      * @param int $seed Set a seed value to return results in the same random order for consistent pagination.
-     * @return \Elastica\Query\FunctionScore
+     *
+     * @return $this
      */
-    public function setRandomScore($seed = NULL)
+    public function setRandomScore($seed = null)
     {
-        $seedParam = array();
+        $seedParam = new \stdClass();
         if (!is_null($seed)) {
-            $seedParam['seed'] = $seed;
+            $seedParam->seed = $seed;
         }
+
         return $this->setParam('random_score', $seedParam);
     }
 
     /**
-     * Set the score method
-     * @param string $mode see SCORE_MODE_* constatns for valid options. Default is multiply.
-     * @return \Elastica\Query\FunctionScore
+     * Set the score method.
+     *
+     * @param string $mode see SCORE_MODE_* constants for valid options. Default is multiply.
+     *
+     * @return $this
      */
     public function setScoreMode($mode)
     {
         return $this->setParam('score_mode', $mode);
     }
 
+    /**
+     * Set min_score option.
+     *
+     * @param float $minScore
+     *
+     * @return $this
+     */
+    public function setMinScore($minScore)
+    {
+        return $this->setParam('min_score', (float) $minScore);
+    }
+
     /**
      * @return array
      */
@@ -181,6 +353,7 @@ public function toArray()
         if (sizeof($this->_functions)) {
             $this->setParam('functions', $this->_functions);
         }
+
         return parent::toArray();
     }
-}
\ No newline at end of file
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Fuzzy.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Fuzzy.php
index 73b0f1a..482433f 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Fuzzy.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Fuzzy.php
@@ -5,23 +5,21 @@
 use Elastica\Exception\InvalidException;
 
 /**
- * Fuzzy query
+ * Fuzzy query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/fuzzy-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-fuzzy-query.html
  */
 class Fuzzy extends AbstractQuery
 {
     /**
-     * Construct a fuzzy query
+     * Construct a fuzzy query.
      *
-     * @param  string                    $fieldName Field name
-     * @param  string                    $value     String to search for
-     * @return \Elastica\Query\Fuzzy Current object
+     * @param string $fieldName Field name
+     * @param string $value     String to search for
      */
-    public function __construct ($fieldName = null, $value = null)
+    public function __construct($fieldName = null, $value = null)
     {
         if ($fieldName and $value) {
             $this->setField($fieldName, $value);
@@ -29,13 +27,14 @@ public function __construct ($fieldName = null, $value = null)
     }
 
     /**
-     * Set field for fuzzy query
+     * Set field for fuzzy query.
+     *
+     * @param string $fieldName Field name
+     * @param string $value     String to search for
      *
-     * @param  string                    $fieldName Field name
-     * @param  string                    $value     String to search for
-     * @return \Elastica\Query\Fuzzy Current object
+     * @return $this
      */
-    public function setField ($fieldName, $value)
+    public function setField($fieldName, $value)
     {
         if (!is_string($value) or !is_string($fieldName)) {
             throw new InvalidException('The field and value arguments must be of type string.');
@@ -43,34 +42,45 @@ public function setField ($fieldName, $value)
         if (count($this->getParams()) > 0 and array_shift(array_keys($this->getParams())) != $fieldName) {
             throw new InvalidException('Fuzzy query can only support a single field.');
         }
+
         return $this->setParam($fieldName, array('value' => $value));
     }
 
     /**
-     * Set optional parameters on the existing query
+     * Set optional parameters on the existing query.
      *
-     * @param  string                    $param option name
-     * @param  mixed                     $value      Value of the parameter
-     * @return \Elastica\Query\Fuzzy Current object
+     * @param string $param option name
+     * @param mixed  $value Value of the parameter
+     *
+     * @return $this
      */
-    public function setFieldOption ($param, $value) {
+    public function setFieldOption($param, $value)
+    {
         //Retrieve the single existing field for alteration.
         $params = $this->getParams();
         if (count($params) < 1) {
-           throw new InvalidException('No field has been set');
+            throw new InvalidException('No field has been set');
         }
         $keyArray = array_keys($params);
         $params[$keyArray[0]][$param] = $value;
 
-        return $this->setparam($keyArray[0], $params[$keyArray[0]]);
+        return $this->setParam($keyArray[0], $params[$keyArray[0]]);
     }
 
     /**
      * Deprecated method of setting a field.
-     * @deprecated
+     *
+     * @deprecated Use setField and setFieldOption instead. This method will be removed in further Elastica releases
+     *
+     * @param $fieldName
+     * @param $args
+     *
+     * @return $this
      */
     public function addField($fieldName, $args)
     {
+        trigger_error('Query\Fuzzy::addField is deprecated. Use setField and setFieldOption instead. This method will be removed in further Elastica releases', E_USER_DEPRECATED);
+
         if (!array_key_exists('value', $args)) {
             throw new InvalidException('Fuzzy query can only support a single field.');
         }
@@ -79,6 +89,7 @@ public function addField($fieldName, $args)
         foreach ($args as $param => $value) {
             $this->setFieldOption($param, $value);
         }
+
         return $this;
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoBoundingBox.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoBoundingBox.php
new file mode 100755
index 0000000..768bd5a
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoBoundingBox.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Elastica\Query;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Geo bounding box query.
+ *
+ * @author Fabian Vogler <fabian@equivalence.ch>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-bounding-box-query.html
+ */
+class GeoBoundingBox extends AbstractQuery
+{
+    /**
+     * Construct BoundingBoxQuery.
+     *
+     * @param string $key         Key
+     * @param array  $coordinates Array with top left coordinate as first and bottom right coordinate as second element
+     */
+    public function __construct($key, array $coordinates)
+    {
+        $this->addCoordinates($key, $coordinates);
+    }
+
+    /**
+     * Add coordinates.
+     *
+     * @param string $key         Key
+     * @param array  $coordinates Array with top left coordinate as first and bottom right coordinate as second element
+     *
+     * @throws \Elastica\Exception\InvalidException If $coordinates doesn't have two elements
+     *
+     * @return $this
+     */
+    public function addCoordinates($key, array $coordinates)
+    {
+        if (!isset($coordinates[0]) || !isset($coordinates[1])) {
+            throw new InvalidException('expected $coordinates to be an array with two elements');
+        }
+
+        $this->setParam($key, array(
+            'top_left' => $coordinates[0],
+            'bottom_right' => $coordinates[1],
+        ));
+
+        return $this;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoDistance.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoDistance.php
new file mode 100755
index 0000000..dfdb968
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoDistance.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Geo distance query.
+ *
+ * @author Nicolas Ruflin <spam@ruflin.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-query.html
+ */
+class GeoDistance extends AbstractGeoDistance
+{
+    const DISTANCE_TYPE_ARC = 'arc';
+    const DISTANCE_TYPE_PLANE = 'plane';
+    const DISTANCE_TYPE_SLOPPY_ARC = 'sloppy_arc';
+
+    const OPTIMIZE_BBOX_MEMORY = 'memory';
+    const OPTIMIZE_BBOX_INDEXED = 'indexed';
+    const OPTIMIZE_BBOX_NONE = 'none';
+
+    /**
+     * Create GeoDistance object.
+     *
+     * @param string       $key      Key
+     * @param array|string $location Location as array or geohash: array('lat' => 48.86, 'lon' => 2.35) OR 'drm3btev3e86'
+     * @param string       $distance Distance
+     *
+     * @throws \Elastica\Exception\InvalidException
+     */
+    public function __construct($key, $location, $distance)
+    {
+        parent::__construct($key, $location);
+
+        $this->setDistance($distance);
+    }
+
+    /**
+     * @param string $distance
+     *
+     * @return $this
+     */
+    public function setDistance($distance)
+    {
+        $this->setParam('distance', $distance);
+
+        return $this;
+    }
+
+    /**
+     * See DISTANCE_TYPE_* constants.
+     *
+     * @param string $distanceType
+     *
+     * @return $this
+     */
+    public function setDistanceType($distanceType)
+    {
+        $this->setParam('distance_type', $distanceType);
+
+        return $this;
+    }
+
+    /**
+     * See OPTIMIZE_BBOX_* constants.
+     *
+     * @param string $optimizeBbox
+     *
+     * @return $this
+     */
+    public function setOptimizeBbox($optimizeBbox)
+    {
+        $this->setParam('optimize_bbox', $optimizeBbox);
+
+        return $this;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoDistanceRange.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoDistanceRange.php
new file mode 100755
index 0000000..e80b512
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoDistanceRange.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Elastica\Query;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Geo distance query.
+ *
+ * @author munkie
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-range-query.html
+ */
+class GeoDistanceRange extends AbstractGeoDistance
+{
+    const RANGE_FROM = 'from';
+    const RANGE_TO = 'to';
+    const RANGE_LT = 'lt';
+    const RANGE_LTE = 'lte';
+    const RANGE_GT = 'gt';
+    const RANGE_GTE = 'gte';
+
+    const RANGE_INCLUDE_LOWER = 'include_lower';
+    const RANGE_INCLUDE_UPPER = 'include_upper';
+
+    /**
+     * @var array
+     */
+    protected $_ranges = array();
+
+    /**
+     * @param string       $key
+     * @param array|string $location
+     * @param array        $ranges
+     *
+     * @internal param string $distance
+     */
+    public function __construct($key, $location, array $ranges = array())
+    {
+        parent::__construct($key, $location);
+
+        if (!empty($ranges)) {
+            $this->setRanges($ranges);
+        }
+    }
+
+    /**
+     * @param array $ranges
+     *
+     * @return $this
+     */
+    public function setRanges(array $ranges)
+    {
+        $this->_ranges = array();
+
+        foreach ($ranges as $key => $value) {
+            $this->setRange($key, $value);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed  $value
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
+     */
+    public function setRange($key, $value)
+    {
+        switch ($key) {
+            case self::RANGE_TO:
+            case self::RANGE_FROM:
+            case self::RANGE_GT:
+            case self::RANGE_GTE:
+            case self::RANGE_LT:
+            case self::RANGE_LTE:
+                break;
+            case self::RANGE_INCLUDE_LOWER:
+            case self::RANGE_INCLUDE_UPPER:
+                $value = (boolean) $value;
+                break;
+            default:
+                throw new InvalidException('Invalid range parameter given: '.$key);
+        }
+        $this->_ranges[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        foreach ($this->_ranges as $key => $value) {
+            $this->setParam($key, $value);
+        }
+
+        return parent::toArray();
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoPolygon.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoPolygon.php
new file mode 100755
index 0000000..5f9c14b
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoPolygon.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Geo polygon query.
+ *
+ * @author Michael Maclean <mgdm@php.net>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-polygon-query.html
+ */
+class GeoPolygon extends AbstractQuery
+{
+    /**
+     * Key.
+     *
+     * @var string Key
+     */
+    protected $_key = '';
+
+    /**
+     * Points making up polygon.
+     *
+     * @var array Points making up polygon
+     */
+    protected $_points = array();
+
+    /**
+     * Construct polygon query.
+     *
+     * @param string $key    Key
+     * @param array  $points Points making up polygon
+     */
+    public function __construct($key, array $points)
+    {
+        $this->_key = $key;
+        $this->_points = $points;
+    }
+
+    /**
+     * Converts query to array.
+     *
+     * @see \Elastica\Query\AbstractQuery::toArray()
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return array(
+            'geo_polygon' => array(
+                $this->_key => array(
+                    'points' => $this->_points,
+                ),
+            ),
+        );
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoShapePreIndexed.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoShapePreIndexed.php
new file mode 100755
index 0000000..112a12a
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoShapePreIndexed.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * geo_shape query for pre-indexed shapes.
+ *
+ * Query pre-indexed shape definitions
+ *
+ * @author Bennie Krijger <benniekrijger@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html
+ */
+class GeoShapePreIndexed extends AbstractGeoShape
+{
+    /**
+     * elasticsearch id of the pre-indexed shape.
+     *
+     * @var string
+     */
+    protected $_indexedId;
+
+    /**
+     * elasticsearch type of the pre-indexed shape.
+     *
+     * @var string
+     */
+    protected $_indexedType;
+
+    /**
+     *  elasticsearch index of the pre-indexed shape.
+     *
+     * @var string
+     */
+    protected $_indexedIndex;
+
+    /**
+     *  elasticsearch path/field name of the pre-indexed shape.
+     *
+     * @var string
+     */
+    protected $_indexedPath;
+
+    /**
+     * Construct geo_shape query with a pre-indexed shape.
+     *
+     * @param string $path         The path/field of the shape searched
+     * @param string $indexedId    Id of the pre-indexed shape
+     * @param string $indexedType  Type of the pre-indexed shape
+     * @param string $indexedIndex Index of the pre-indexed shape
+     * @param string $indexedPath  Path of the pre-indexed shape
+     */
+    public function __construct($path, $indexedId, $indexedType, $indexedIndex, $indexedPath)
+    {
+        $this->_path = $path;
+        $this->_indexedId = $indexedId;
+        $this->_indexedType = $indexedType;
+        $this->_indexedIndex = $indexedIndex;
+        $this->_indexedPath = $indexedPath;
+    }
+
+    /**
+     * Converts query to array.
+     *
+     * @see \Elastica\Query\AbstractQuery::toArray()
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return array(
+            'geo_shape' => array(
+                $this->_path => array(
+                    'indexed_shape' => array(
+                        'id' => $this->_indexedId,
+                        'type' => $this->_indexedType,
+                        'index' => $this->_indexedIndex,
+                        'path' => $this->_indexedPath,
+                    ),
+                    'relation' => $this->_relation,
+                ),
+            ),
+        );
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoShapeProvided.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoShapeProvided.php
new file mode 100755
index 0000000..8e3b34e
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeoShapeProvided.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * geo_shape query or provided shapes.
+ *
+ * Query provided shape definitions
+ *
+ * @author BennieKrijger <benniekrijger@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html
+ */
+class GeoShapeProvided extends AbstractGeoShape
+{
+    const TYPE_ENVELOPE = 'envelope';
+    const TYPE_MULTIPOINT = 'multipoint';
+    const TYPE_POINT = 'point';
+    const TYPE_MULTIPOLYGON = 'multipolygon';
+    const TYPE_LINESTRING = 'linestring';
+    const TYPE_POLYGON = 'polygon';
+
+    /**
+     * Type of the geo_shape.
+     *
+     * @var string
+     */
+    protected $_shapeType;
+
+    /**
+     * Coordinates making up geo_shape.
+     *
+     * @var array Coordinates making up geo_shape
+     */
+    protected $_coordinates;
+
+    /**
+     * Construct geo_shape query.
+     *
+     * @param string $path        The path/field of the shape searched
+     * @param array  $coordinates Points making up the shape
+     * @param string $shapeType   Type of the geo_shape:
+     *                            point, envelope, linestring, polygon,
+     *                            multipoint or multipolygon
+     */
+    public function __construct($path, array $coordinates, $shapeType = self::TYPE_ENVELOPE)
+    {
+        $this->_path = $path;
+        $this->_shapeType = $shapeType;
+        $this->_coordinates = $coordinates;
+    }
+
+    /**
+     * Converts query to array.
+     *
+     * @see \Elastica\Query\AbstractQuery::toArray()
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return array(
+            'geo_shape' => array(
+                $this->_path => array(
+                    'shape' => array(
+                        'type' => $this->_shapeType,
+                        'coordinates' => $this->_coordinates,
+                        'relation' => $this->_relation,
+                    ),
+                ),
+            ),
+        );
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeohashCell.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeohashCell.php
new file mode 100755
index 0000000..9c6ffb2
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/GeohashCell.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Class GeohashCell.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geohash-cell-query.html
+ */
+class GeohashCell extends AbstractGeoDistance
+{
+    /**
+     * @param string       $key       The field on which to query
+     * @param array|string $location  Location as coordinates array or geohash string ['lat' => 40.3, 'lon' => 45.2]
+     * @param string|int   $precision Integer length of geohash prefix or distance (3, or "50m")
+     * @param bool         $neighbors If true, queries cells next to the given cell.
+     */
+    public function __construct($key, $location, $precision = -1, $neighbors = false)
+    {
+        parent::__construct($key, $location);
+        $this->setPrecision($precision);
+        $this->setNeighbors($neighbors);
+    }
+
+    /**
+     * Set the precision for this query.
+     *
+     * @param string|int $precision Integer length of geohash prefix or distance (3, or "50m")
+     *
+     * @return $this
+     */
+    public function setPrecision($precision)
+    {
+        return $this->setParam('precision', $precision);
+    }
+
+    /**
+     * Set the neighbors option for this query.
+     *
+     * @param bool $neighbors If true, queries cells next to the given cell.
+     *
+     * @return $this
+     */
+    public function setNeighbors($neighbors)
+    {
+        return $this->setParam('neighbors', (bool) $neighbors);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/HasChild.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/HasChild.php
index d0b22e4..832ca29 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/HasChild.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/HasChild.php
@@ -1,49 +1,48 @@
 <?php
 
 namespace Elastica\Query;
+
 use Elastica\Query as BaseQuery;
 
 /**
- * Returns parent documents having child docs matching the query
+ * Returns parent documents having child docs matching the query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Fabian Vogler <fabian@equivalence.ch>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/has-child-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-child-query.html
  */
 class HasChild extends AbstractQuery
 {
     /**
-     * Construct HasChild Query
+     * Construct HasChild Query.
      *
-     * @param string|\Elastica\Query $query Query string or a Elastica\Query object
-     * @param string                $type  Parent document type
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
+     * @param string                                               $type  Parent document type
      */
     public function __construct($query, $type = null)
     {
-        $this->setQuery($query);
         $this->setType($type);
+        $this->setQuery($query);
     }
 
     /**
-     * Sets query object
+     * Sets query object.
      *
-     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
-     * @return \Elastica\Query\HasChild
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
+     *
+     * @return $this
      */
     public function setQuery($query)
     {
-        $query = BaseQuery::create($query);
-        $data = $query->toArray();
-
-        return $this->setParam('query', $data['query']);
+        return $this->setParam('query', BaseQuery::create($query));
     }
 
     /**
-     * Set type of the parent document
+     * Set type of the parent document.
      *
-     * @param  string                       $type Parent document type
-     * @return \Elastica\Query\HasChild Current object
+     * @param string $type Parent document type
+     *
+     * @return $this
      */
     public function setType($type)
     {
@@ -51,13 +50,30 @@ public function setType($type)
     }
 
     /**
-     * Sets the scope
+     * Sets the scope.
+     *
+     * @param string $scope Scope
      *
-     * @param  string                       $scope Scope
-     * @return \Elastica\Query\HasChild Current object
+     * @return $this
      */
     public function setScope($scope)
     {
         return $this->setParam('_scope', $scope);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        $baseName = $this->_getBaseName();
+
+        if (isset($array[$baseName]['query'])) {
+            $array[$baseName]['query'] = $array[$baseName]['query']['query'];
+        }
+
+        return $array;
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/HasParent.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/HasParent.php
index dda880f..d782282 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/HasParent.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/HasParent.php
@@ -1,22 +1,21 @@
 <?php
 
 namespace Elastica\Query;
+
 use Elastica\Query as BaseQuery;
 
 /**
- * Returns child documents having parent docs matching the query
+ * Returns child documents having parent docs matching the query.
  *
- * @category Xodoa
- * @package Elastica
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/has-parent-query.html
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-parent-query.html
  */
 class HasParent extends AbstractQuery
 {
     /**
-     * Construct HasChild Query
+     * Construct HasChild Query.
      *
-     * @param string|\Elastica\Query $query Query string or a Elastica\Query object
-     * @param string                $type  Parent document type
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
+     * @param string                                               $type  Parent document type
      */
     public function __construct($query, $type)
     {
@@ -25,24 +24,23 @@ public function __construct($query, $type)
     }
 
     /**
-     * Sets query object
+     * Sets query object.
+     *
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
      *
-     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
-     * @return \Elastica\Filter\HasParent
+     * @return $this
      */
     public function setQuery($query)
     {
-        $query = BaseQuery::create($query);
-        $data = $query->toArray();
-
-        return $this->setParam('query', $data['query']);
+        return $this->setParam('query', BaseQuery::create($query));
     }
 
     /**
-     * Set type of the parent document
+     * Set type of the parent document.
+     *
+     * @param string $type Parent document type
      *
-     * @param  string                          $type Parent document type
-     * @return \Elastica\Filter\HasParent Current object
+     * @return $this
      */
     public function setType($type)
     {
@@ -50,13 +48,30 @@ public function setType($type)
     }
 
     /**
-     * Sets the scope
+     * Sets the scope.
      *
-     * @param  string                          $scope Scope
-     * @return \Elastica\Filter\HasParent Current object
+     * @param string $scope Scope
+     *
+     * @return $this
      */
     public function setScope($scope)
     {
         return $this->setParam('_scope', $scope);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        $baseName = $this->_getBaseName();
+
+        if (isset($array[$baseName]['query'])) {
+            $array[$baseName]['query'] = $array[$baseName]['query']['query'];
+        }
+
+        return $array;
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Ids.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Ids.php
index f4a6f1a..895e50d 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Ids.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Ids.php
@@ -1,32 +1,32 @@
 <?php
 
 namespace Elastica\Query;
+
 use Elastica\Type;
 
 /**
- * Ids Query
+ * Ids Query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Lee Parker
  * @author Nicolas Ruflin <spam@ruflin.com>
  * @author Tim Rupp
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/ids-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html
  */
 class Ids extends AbstractQuery
 {
     /**
-     * Params
+     * Params.
      *
      * @var array Params
      */
     protected $_params = array();
 
     /**
-     * Creates filter object
+     * Creates filter object.
      *
      * @param string|\Elastica\Type $type Type to filter on
-     * @param array                $ids  List of ids
+     * @param array                 $ids  List of ids
      */
     public function __construct($type = null, array $ids = array())
     {
@@ -35,10 +35,11 @@ public function __construct($type = null, array $ids = array())
     }
 
     /**
-     * Adds one more filter to the and filter
+     * Adds one more filter to the and filter.
      *
-     * @param  string                  $id Adds id to filter
-     * @return \Elastica\Query\Ids Current object
+     * @param string $id Adds id to filter
+     *
+     * @return $this
      */
     public function addId($id)
     {
@@ -48,10 +49,11 @@ public function addId($id)
     }
 
     /**
-     * Adds one more type to query
+     * Adds one more type to query.
+     *
+     * @param string|\Elastica\Type $type Type name or object
      *
-     * @param  string|\Elastica\Type    $type Type name or object
-     * @return \Elastica\Query\Ids Current object
+     * @return $this
      */
     public function addType($type)
     {
@@ -68,10 +70,11 @@ public function addType($type)
     }
 
     /**
-     * Set type
+     * Set type.
      *
-     * @param  string|\Elastica\Type $type Type name or object
-     * @return \Elastica\Query\Ids   Current object
+     * @param string|\Elastica\Type $type Type name or object
+     *
+     * @return $this
      */
     public function setType($type)
     {
@@ -88,10 +91,11 @@ public function setType($type)
     }
 
     /**
-     * Sets the ids to filter
+     * Sets the ids to filter.
+     *
+     * @param array|string $ids List of ids
      *
-     * @param  array|string            $ids List of ids
-     * @return \Elastica\Query\Ids Current object
+     * @return $this
      */
     public function setIds($ids)
     {
@@ -105,9 +109,10 @@ public function setIds($ids)
     }
 
     /**
-     * Converts filter to array
+     * Converts filter to array.
      *
      * @see \Elastica\Query\AbstractQuery::toArray()
+     *
      * @return array Query array
      */
     public function toArray()
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Image.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Image.php
new file mode 100755
index 0000000..edb9755
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Image.php
@@ -0,0 +1,188 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Image query.
+ *
+ * @author   Jacques Moati <jacques@moati.net>
+ *
+ * @link     https://github.com/kzwang/elasticsearch-image
+ *
+ * To use this feature you have to call the following command in the
+ * elasticsearch directory:
+ * <code>
+ * ./bin/plugin --url https://github.com/Jmoati/elasticsearch-image/releases/download/1.7.1/elasticsearch-image-1.7.1.zip --install image
+ * </code>
+ * This installs the image plugin. More infos
+ * can be found here: {@link https://github.com/Jmoati/elasticsearch-image}
+ */
+class Image extends AbstractQuery
+{
+    public function __construct(array $image = array())
+    {
+        $this->setParams($image);
+    }
+
+    /**
+     * Sets a param for the given field.
+     *
+     * @param string $field
+     * @param string $key
+     * @param string $value
+     *
+     * @return $this
+     */
+    public function setFieldParam($field, $key, $value)
+    {
+        if (!isset($this->_params[$field])) {
+            $this->_params[$field] = array();
+        }
+
+        $this->_params[$field][$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Set field boost value.
+     *
+     * If not set, defaults to 1.0.
+     *
+     * @param string $field
+     * @param float  $boost
+     *
+     * @return $this
+     */
+    public function setFieldBoost($field, $boost = 1.0)
+    {
+        return $this->setFieldParam($field, 'boost', (float) $boost);
+    }
+
+    /**
+     * Set field feature value.
+     *
+     * If not set, defaults CEDD.
+     *
+     * @param string $field
+     * @param string $feature
+     *
+     * @return $this
+     */
+    public function setFieldFeature($field, $feature = 'CEDD')
+    {
+        return $this->setFieldParam($field, 'feature', $feature);
+    }
+
+    /**
+     * Set field hash value.
+     *
+     * If not set, defaults BIT_SAMPLING.
+     *
+     * @param string $field
+     * @param string $hash
+     *
+     * @return $this
+     */
+    public function setFieldHash($field, $hash = 'BIT_SAMPLING')
+    {
+        return $this->setFieldParam($field, 'hash', $hash);
+    }
+
+    /**
+     * Set field image value.
+     *
+     * @param string $field
+     * @param string $path  File will be base64_encode
+     *
+     * @throws \Exception
+     *
+     * @return $this
+     */
+    public function setFieldImage($field, $path)
+    {
+        if (!file_exists($path) || !is_readable($path)) {
+            throw new \Exception(sprintf("File %s can't be open", $path));
+        }
+
+        return $this->setFieldParam($field, 'image', base64_encode(file_get_contents($path)));
+    }
+
+    /**
+     * Set field index value.
+     *
+     * @param string $field
+     * @param string $index
+     *
+     * @return $this
+     */
+    public function setFieldIndex($field, $index)
+    {
+        return $this->setFieldParam($field, 'index', $index);
+    }
+
+    /**
+     * Set field type value.
+     *
+     * @param string $field
+     * @param string $type
+     *
+     * @return $this
+     */
+    public function setFieldType($field, $type)
+    {
+        return $this->setFieldParam($field, 'type', $type);
+    }
+
+    /**
+     * Set field id value.
+     *
+     * @param string $field
+     * @param string $id
+     *
+     * @return $this
+     */
+    public function setFieldId($field, $id)
+    {
+        return $this->setFieldParam($field, 'id', $id);
+    }
+
+    /**
+     * Set field path value.
+     *
+     * @param string $field
+     * @param string $path
+     *
+     * @return $this
+     */
+    public function setFieldPath($field, $path)
+    {
+        return $this->setFieldParam($field, 'path', $path);
+    }
+
+    /**
+     * Define quickly a reference image already in your elasticsearch database.
+     *
+     * If not set, path will be the same as $field.
+     *
+     * @param string $field
+     * @param string $index
+     * @param string $type
+     * @param string $id
+     * @param string $path
+     *
+     * @return $this
+     */
+    public function setImageByReference($field, $index, $type, $id, $path = null)
+    {
+        if (null === $path) {
+            $path = $field;
+        }
+
+        $this->setFieldIndex($field, $index);
+        $this->setFieldType($field, $type);
+        $this->setFieldId($field, $id);
+
+        return $this->setFieldPath($field, $path);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Indices.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Indices.php
new file mode 100755
index 0000000..82b9ef5
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Indices.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Elastica\Query;
+
+use Elastica\Index as ElasticaIndex;
+
+/**
+ * Class Indices.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-indices-query.html
+ */
+class Indices extends AbstractQuery
+{
+    /**
+     * @param AbstractQuery $query   Query which will be applied to docs in the specified indices
+     * @param mixed[]       $indices
+     */
+    public function __construct(AbstractQuery $query, array $indices)
+    {
+        $this->setIndices($indices)->setQuery($query);
+    }
+
+    /**
+     * Set the indices on which this query should be applied.
+     *
+     * @param mixed[] $indices
+     *
+     * @return $this
+     */
+    public function setIndices(array $indices)
+    {
+        $this->setParam('indices', array());
+        foreach ($indices as $index) {
+            $this->addIndex($index);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds one more index on which this query should be applied.
+     *
+     * @param string|\Elastica\Index $index
+     *
+     * @return $this
+     */
+    public function addIndex($index)
+    {
+        if ($index instanceof ElasticaIndex) {
+            $index = $index->getName();
+        }
+
+        return $this->addParam('indices', (string) $index);
+    }
+
+    /**
+     * Set the query to be applied to docs in the specified indices.
+     *
+     * @param AbstractQuery $query
+     *
+     * @return $this
+     */
+    public function setQuery(AbstractQuery $query)
+    {
+        return $this->setParam('query', $query);
+    }
+
+    /**
+     * Set the query to be applied to docs in indices which do not match those specified in the "indices" parameter.
+     *
+     * @param AbstractQuery $query
+     *
+     * @return $this
+     */
+    public function setNoMatchQuery(AbstractQuery $query)
+    {
+        return $this->setParam('no_match_query', $query);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Limit.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Limit.php
new file mode 100755
index 0000000..1e3d3de
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Limit.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Limit Query.
+ *
+ * @author Nicolas Ruflin <spam@ruflin.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-limit-query.html
+ */
+class Limit extends AbstractQuery
+{
+    /**
+     * Construct limit query.
+     *
+     * @param int $limit Limit
+     */
+    public function __construct($limit)
+    {
+        $this->setLimit($limit);
+    }
+
+    /**
+     * Set the limit.
+     *
+     * @param int $limit Limit
+     *
+     * @return $this
+     */
+    public function setLimit($limit)
+    {
+        return $this->setParam('value', (int) $limit);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Match.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Match.php
index eceefe0..59c5869 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Match.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Match.php
@@ -3,21 +3,36 @@
 namespace Elastica\Query;
 
 /**
- * Match query
+ * Match query.
  *
- * @category Xodoa
- * @package Elastica
  * @author F21
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/match-query.html
+ * @author WONG Wing Lun <luiges90@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html
  */
 class Match extends AbstractQuery
 {
+    const ZERO_TERM_NONE = 'none';
+    const ZERO_TERM_ALL = 'all';
+
     /**
-     * Sets a param for the message array
+     * @param string $field
+     * @param mixed  $values
+     */
+    public function __construct($field = null, $values = null)
+    {
+        if ($field !== null && $values !== null) {
+            $this->setParam($field, $values);
+        }
+    }
+
+    /**
+     * Sets a param for the message array.
+     *
+     * @param string $field
+     * @param mixed  $values
      *
-     * @param  string                    $field
-     * @param  mixed                     $values
-     * @return \Elastica\Query\Match
+     * @return $this
      */
     public function setField($field, $values)
     {
@@ -25,12 +40,13 @@ public function setField($field, $values)
     }
 
     /**
-     * Sets a param for the given field
+     * Sets a param for the given field.
      *
-     * @param  string                    $field
-     * @param  string                    $key
-     * @param  string                    $value
-     * @return \Elastica\Query\Match
+     * @param string $field
+     * @param string $key
+     * @param string $value
+     *
+     * @return $this
      */
     public function setFieldParam($field, $key, $value)
     {
@@ -44,11 +60,12 @@ public function setFieldParam($field, $key, $value)
     }
 
     /**
-     * Sets the query string
+     * Sets the query string.
+     *
+     * @param string $field
+     * @param string $query
      *
-     * @param  string                    $field
-     * @param  string                    $query
-     * @return \Elastica\Query\Match
+     * @return $this
      */
     public function setFieldQuery($field, $query)
     {
@@ -56,11 +73,12 @@ public function setFieldQuery($field, $query)
     }
 
     /**
-     * Set field type
+     * Set field type.
+     *
+     * @param string $field
+     * @param string $type
      *
-     * @param  string                    $field
-     * @param  string                    $type
-     * @return \Elastica\Query\Match
+     * @return $this
      */
     public function setFieldType($field, $type)
     {
@@ -68,11 +86,12 @@ public function setFieldType($field, $type)
     }
 
     /**
-     * Set field operator
+     * Set field operator.
      *
-     * @param  string                    $field
-     * @param  string                    $operator
-     * @return \Elastica\Query\Match
+     * @param string $field
+     * @param string $operator
+     *
+     * @return $this
      */
     public function setFieldOperator($field, $operator)
     {
@@ -80,11 +99,12 @@ public function setFieldOperator($field, $operator)
     }
 
     /**
-     * Set field analyzer
+     * Set field analyzer.
+     *
+     * @param string $field
+     * @param string $analyzer
      *
-     * @param  string                    $field
-     * @param  string                    $analyzer
-     * @return \Elastica\Query\Match
+     * @return $this
      */
     public function setFieldAnalyzer($field, $analyzer)
     {
@@ -92,13 +112,14 @@ public function setFieldAnalyzer($field, $analyzer)
     }
 
     /**
-     * Set field boost value
+     * Set field boost value.
      *
      * If not set, defaults to 1.0.
      *
-     * @param  string                    $field
-     * @param  float                     $boost
-     * @return \Elastica\Query\Match
+     * @param string $field
+     * @param float  $boost
+     *
+     * @return $this
      */
     public function setFieldBoost($field, $boost = 1.0)
     {
@@ -106,12 +127,14 @@ public function setFieldBoost($field, $boost = 1.0)
     }
 
     /**
-     * Set field minimum should match
+     * Set field minimum should match.
+     *
+     * @param string     $field
+     * @param int|string $minimumShouldMatch
      *
-     * @param  string                    $field
-     * @param  int|string                       $minimumShouldMatch
-     * @return \Elastica\Query\Match
-     * @link Possible values for minimum_should_match http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html
+     * @return $this
+     *
+     * @link Possible values for minimum_should_match https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html
      */
     public function setFieldMinimumShouldMatch($field, $minimumShouldMatch)
     {
@@ -119,23 +142,25 @@ public function setFieldMinimumShouldMatch($field, $minimumShouldMatch)
     }
 
     /**
-     * Set field fuzziness
+     * Set field fuzziness.
+     *
+     * @param string $field
+     * @param mixed  $fuzziness
      *
-     * @param  string                    $field
-     * @param  float                     $fuzziness
-     * @return \Elastica\Query\Match
+     * @return $this
      */
     public function setFieldFuzziness($field, $fuzziness)
     {
-        return $this->setFieldParam($field, 'fuzziness', (float) $fuzziness);
+        return $this->setFieldParam($field, 'fuzziness', $fuzziness);
     }
 
     /**
-     * Set field fuzzy rewrite
+     * Set field fuzzy rewrite.
      *
-     * @param  string                    $field
-     * @param  string                    $fuzzyRewrite
-     * @return \Elastica\Query\Match
+     * @param string $field
+     * @param string $fuzzyRewrite
+     *
+     * @return $this
      */
     public function setFieldFuzzyRewrite($field, $fuzzyRewrite)
     {
@@ -143,11 +168,12 @@ public function setFieldFuzzyRewrite($field, $fuzzyRewrite)
     }
 
     /**
-     * Set field prefix length
+     * Set field prefix length.
+     *
+     * @param string $field
+     * @param int    $prefixLength
      *
-     * @param  string                    $field
-     * @param  int                       $prefixLength
-     * @return \Elastica\Query\Match
+     * @return $this
      */
     public function setFieldPrefixLength($field, $prefixLength)
     {
@@ -155,14 +181,43 @@ public function setFieldPrefixLength($field, $prefixLength)
     }
 
     /**
-     * Set field max expansions
+     * Set field max expansions.
+     *
+     * @param string $field
+     * @param int    $maxExpansions
      *
-     * @param  string                    $field
-     * @param  int                       $maxExpansions
-     * @return \Elastica\Query\Match
+     * @return $this
      */
     public function setFieldMaxExpansions($field, $maxExpansions)
     {
         return $this->setFieldParam($field, 'max_expansions', (int) $maxExpansions);
     }
+
+    /**
+     * Set zero terms query.
+     *
+     * If not set, default to 'none'
+     *
+     * @param string $field
+     * @param string $zeroTermQuery
+     *
+     * @return $this
+     */
+    public function setFieldZeroTermsQuery($field, $zeroTermQuery = 'none')
+    {
+        return $this->setFieldParam($field, 'zero_terms_query', $zeroTermQuery);
+    }
+
+    /**
+     * Set cutoff frequency.
+     *
+     * @param string $field
+     * @param float  $cutoffFrequency
+     *
+     * @return $this
+     */
+    public function setFieldCutoffFrequency($field, $cutoffFrequency)
+    {
+        return $this->setFieldParam($field, 'cutoff_frequency', $cutoffFrequency);
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchAll.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchAll.php
index 23b4fdf..3189d74 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchAll.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchAll.php
@@ -3,17 +3,16 @@
 namespace Elastica\Query;
 
 /**
- * Match all query. Returns all results
+ * Match all query. Returns all results.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/match-all-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-all-query.html
  */
 class MatchAll extends AbstractQuery
 {
     /**
-     * Creates match all query
+     * Creates match all query.
      */
     public function __construct()
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchPhrase.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchPhrase.php
new file mode 100755
index 0000000..61cdbca
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchPhrase.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Match Phrase query.
+ *
+ * @author Jacques Moati <jacques@moati.net>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html#_phrase
+ */
+class MatchPhrase extends Match
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchPhrasePrefix.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchPhrasePrefix.php
new file mode 100755
index 0000000..a686e8d
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MatchPhrasePrefix.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Match Phrase Prefix query.
+ *
+ * @author Jacques Moati <jacques@moati.net>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html#_match_phrase_prefix
+ */
+class MatchPhrasePrefix extends Match
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Missing.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Missing.php
new file mode 100755
index 0000000..a7f43b9
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Missing.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Missing Query.
+ *
+ * @author Maciej Wiercinski <maciej@wiercinski.net>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-missing-query.html
+ */
+class Missing extends AbstractQuery
+{
+    /**
+     * Construct missing query.
+     *
+     * @param string $field OPTIONAL
+     */
+    public function __construct($field = '')
+    {
+        if (strlen($field)) {
+            $this->setField($field);
+        }
+    }
+
+    /**
+     * Set field.
+     *
+     * @param string $field
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', (string) $field);
+    }
+
+    /**
+     * Set "existence" parameter.
+     *
+     * @param bool $existence
+     *
+     * @return $this
+     */
+    public function setExistence($existence)
+    {
+        return $this->setParam('existence', (bool) $existence);
+    }
+
+    /**
+     * Set "null_value" parameter.
+     *
+     * @param bool $nullValue
+     *
+     * @return $this
+     */
+    public function setNullValue($nullValue)
+    {
+        return $this->setParam('null_value', (bool) $nullValue);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MoreLikeThis.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MoreLikeThis.php
index d9ae428..99edfa6 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MoreLikeThis.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MoreLikeThis.php
@@ -2,20 +2,23 @@
 
 namespace Elastica\Query;
 
+use Elastica\Document;
+use Elastica\Exception\DeprecatedException;
+
 /**
- * More Like This query
+ * More Like This query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Raul Martinez, Jr <juneym@gmail.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/mlt-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-mlt-query.html
  */
 class MoreLikeThis extends AbstractQuery
 {
     /**
-     * Adds field to mlt query
+     * Set fields to which to restrict the mlt query.
+     *
+     * @param array $fields Field names
      *
-     * @param  array                            $fields Field names
      * @return \Elastica\Query\MoreLikeThis Current object
      */
     public function setFields(array $fields)
@@ -24,23 +27,51 @@ public function setFields(array $fields)
     }
 
     /**
-     * Set the "like_text" value
+     * Set document ids for the mlt query.
      *
-     * @param  string                           $likeText
-     * @return \Elastica\Query\MoreLikeThis This current object
+     * @param array $ids Document ids
+     *
+     * @deprecated Option "ids" deprecated as of ES 2.0.0-beta1 and will be removed in further Elastica releases. Use "like" instead.
+     
+     * @return \Elastica\Query\MoreLikeThis Current object
      */
-    public function setLikeText($likeText)
+    public function setIds(array $ids)
     {
-        $likeText = trim($likeText);
+        throw new DeprecatedException('Option "ids" deprecated as of ES 2.0.0-beta1 and will be removed in further Elastica releases. Use "like" instead.');
+    }
 
-        return $this->setParam('like_text', $likeText);
+    /**
+     * Set the "like" value.
+     *
+     * @param string|Document $like
+     *
+     * @return $this
+     */
+    public function setLike($like)
+    {
+        return $this->setParam('like', $like);
+    }
+
+    /**
+     * Set the "like_text" value.
+     *
+     * @param string $likeText
+     *
+     * @deprecated Option "like_text" deprecated as of ES 2.0.0-beta1 and will be removed at further Elastica releases. Use "like" instead.
+     
+     * @return $this
+     */
+    public function setLikeText($likeText)
+    {
+        throw new DeprecatedException('Option "like_text" deprecated as of ES 2.0.0-beta1 and will be removed in further Elastica releases. Use "like" instead.');
     }
 
     /**
-     * Set boost
+     * Set boost.
+     *
+     * @param float $boost Boost value
      *
-     * @param  float                            $boost Boost value
-     * @return \Elastica\Query\MoreLikeThis Query object
+     * @return $this
      */
     public function setBoost($boost)
     {
@@ -48,10 +79,11 @@ public function setBoost($boost)
     }
 
     /**
-     * Set max_query_terms
+     * Set max_query_terms.
      *
-     * @param  int                              $maxQueryTerms Max query terms value
-     * @return \Elastica\Query\MoreLikeThis
+     * @param int $maxQueryTerms Max query terms value
+     *
+     * @return $this
      */
     public function setMaxQueryTerms($maxQueryTerms)
     {
@@ -59,21 +91,25 @@ public function setMaxQueryTerms($maxQueryTerms)
     }
 
     /**
-     * Set percent terms to match
+     * Set percent terms to match.
+     *
+     * @param float $percentTermsToMatch Percentage
+     *
+     * @return $this
      *
-     * @param  float                            $percentTermsToMatch Percentage
-     * @return \Elastica\Query\MoreLikeThis
+     * @deprecated Option "percent_terms_to_match" deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "minimum_should_match" instead.
      */
     public function setPercentTermsToMatch($percentTermsToMatch)
     {
-        return $this->setParam('percent_terms_to_match', (float) $percentTermsToMatch);
+        throw new DeprecatedException('Option "percent_terms_to_match" deprecated as of ES 1.5 and will be removed in further Elastica releases. Use "minimum_should_match" instead.');
     }
 
     /**
-     * Set min term frequency
+     * Set min term frequency.
      *
-     * @param  int                              $minTermFreq
-     * @return \Elastica\Query\MoreLikeThis
+     * @param int $minTermFreq
+     *
+     * @return $this
      */
     public function setMinTermFrequency($minTermFreq)
     {
@@ -81,10 +117,11 @@ public function setMinTermFrequency($minTermFreq)
     }
 
     /**
-     * set min document frequency
+     * set min document frequency.
+     *
+     * @param int $minDocFreq
      *
-     * @param  int                              $minDocFreq
-     * @return \Elastica\Query\MoreLikeThis
+     * @return $this
      */
     public function setMinDocFrequency($minDocFreq)
     {
@@ -92,10 +129,11 @@ public function setMinDocFrequency($minDocFreq)
     }
 
     /**
-     * set max document frequency
+     * set max document frequency.
+     *
+     * @param int $maxDocFreq
      *
-     * @param  int                              $maxDocFreq
-     * @return \Elastica\Query\MoreLikeThis
+     * @return $this
      */
     public function setMaxDocFrequency($maxDocFreq)
     {
@@ -103,10 +141,11 @@ public function setMaxDocFrequency($maxDocFreq)
     }
 
     /**
-     * Set min word length
+     * Set min word length.
      *
-     * @param  int                              $minWordLength
-     * @return \Elastica\Query\MoreLikeThis
+     * @param int $minWordLength
+     *
+     * @return $this
      */
     public function setMinWordLength($minWordLength)
     {
@@ -114,10 +153,11 @@ public function setMinWordLength($minWordLength)
     }
 
     /**
-     * Set max word length
+     * Set max word length.
+     *
+     * @param int $maxWordLength
      *
-     * @param  int                              $maxWordLength
-     * @return \Elastica\Query\MoreLikeThis
+     * @return $this
      */
     public function setMaxWordLength($maxWordLength)
     {
@@ -125,11 +165,11 @@ public function setMaxWordLength($maxWordLength)
     }
 
     /**
-     * Set boost terms
+     * Set boost terms.
+     *
+     * @param bool $boostTerms
      *
-     * @param  bool                             $boostTerms
-     * @return \Elastica\Query\MoreLikeThis
-     * @link http://www.elasticsearch.org/guide/reference/query-dsl/mlt-query.html
+     * @return $this
      */
     public function setBoostTerms($boostTerms)
     {
@@ -137,10 +177,11 @@ public function setBoostTerms($boostTerms)
     }
 
     /**
-     * Set analyzer
+     * Set analyzer.
      *
-     * @param  string                           $analyzer
-     * @return \Elastica\Query\MoreLikeThis
+     * @param string $analyzer
+     *
+     * @return $this
      */
     public function setAnalyzer($analyzer)
     {
@@ -150,13 +191,47 @@ public function setAnalyzer($analyzer)
     }
 
     /**
-     * Set stop words
+     * Set stop words.
+     *
+     * @param array $stopWords
      *
-     * @param  array                            $stopWords
-     * @return \Elastica\Query\MoreLikeThis
+     * @return $this
      */
     public function setStopWords(array $stopWords)
     {
         return $this->setParam('stop_words', $stopWords);
     }
+
+    /**
+     * Set minimum_should_match option.
+     *
+     * @param int|string $minimumShouldMatch
+     *
+     * @return $this
+     */
+    public function setMinimumShouldMatch($minimumShouldMatch)
+    {
+        return $this->setParam('minimum_should_match', $minimumShouldMatch);
+    }
+
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        // If _id is provided, perform MLT on an existing document from the index
+        // If _source is provided, perform MLT on a document provided as an input
+        if (!empty($array['more_like_this']['like']['_id'])) {
+            $doc = $array['more_like_this']['like'];
+            $doc = array_intersect_key($doc, array('_index' => 1, '_type' => 1, '_id' => 1));
+            $array['more_like_this']['like'] = $doc;
+        } elseif (!empty($array['more_like_this']['like']['_source'])) {
+            $doc = $array['more_like_this']['like'];
+            $doc['doc'] = $array['more_like_this']['like']['_source'];
+            unset($doc['_id']);
+            unset($doc['_source']);
+            $array['more_like_this']['like'] = $doc;
+        }
+
+        return $array;
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MultiMatch.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MultiMatch.php
index 1afa6bf..6b5459e 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MultiMatch.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/MultiMatch.php
@@ -3,21 +3,36 @@
 namespace Elastica\Query;
 
 /**
- * Multi Match
+ * Multi Match.
  *
- * @category Xodoa
- * @package Elastica
  * @author Rodolfo Adhenawer Campagnoli Moraes <adhenawer@gmail.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/multi-match-query.html
+ * @author Wong Wing Lun <luiges90@gmail.com>
+ * @author Tristan Maindron <tmaindron@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-multi-match-query.html
  */
 class MultiMatch extends AbstractQuery
 {
+    const TYPE_BEST_FIELDS = 'best_fields';
+    const TYPE_MOST_FIELDS = 'most_fields';
+    const TYPE_CROSS_FIELDS = 'cross_fields';
+    const TYPE_PHRASE = 'phrase';
+    const TYPE_PHRASE_PREFIX = 'phrase_prefix';
+
+    const OPERATOR_OR = 'or';
+    const OPERATOR_AND = 'and';
+
+    const ZERO_TERM_NONE = 'none';
+    const ZERO_TERM_ALL = 'all';
+
+    const FUZZINESS_AUTO = 'AUTO';
 
     /**
-     * Sets the query
+     * Sets the query.
+     *
+     * @param string $query Query
      *
-     * @param  string                         $query Query
-     * @return \Elastica\Query\MultiMatch Current object
+     * @return $this
      */
     public function setQuery($query = '')
     {
@@ -27,8 +42,9 @@ public function setQuery($query = '')
     /**
      * Sets Fields to be used in the query.
      *
-     * @param  array                          $fields Fields
-     * @return \Elastica\Query\MultiMatch Current object
+     * @param array $fields Fields
+     *
+     * @return $this
      */
     public function setFields($fields = array())
     {
@@ -40,8 +56,9 @@ public function setFields($fields = array())
      *
      * If not set, defaults to true.
      *
-     * @param  boolean                        $useDisMax
-     * @return \Elastica\Query\MultiMatch Current object
+     * @param bool $useDisMax
+     *
+     * @return $this
      */
     public function setUseDisMax($useDisMax = true)
     {
@@ -53,11 +70,124 @@ public function setUseDisMax($useDisMax = true)
      *
      * If not set, defaults to 0.0.
      *
-     * @param  float                          $tieBreaker
-     * @return \Elastica\Query\MultiMatch Current object
+     * @param float $tieBreaker
+     *
+     * @return $this
      */
     public function setTieBreaker($tieBreaker = 0.0)
     {
         return $this->setParam('tie_breaker', $tieBreaker);
     }
+
+    /**
+     * Sets operator for Match Query.
+     *
+     * If not set, defaults to 'or'
+     *
+     * @param string $operator
+     *
+     * @return $this
+     */
+    public function setOperator($operator = 'or')
+    {
+        return $this->setParam('operator', $operator);
+    }
+
+    /**
+     * Set field minimum should match for Match Query.
+     *
+     * @param mixed $minimumShouldMatch
+     *
+     * @return $this
+     */
+    public function setMinimumShouldMatch($minimumShouldMatch)
+    {
+        return $this->setParam('minimum_should_match', $minimumShouldMatch);
+    }
+
+    /**
+     * Set zero terms query for Match Query.
+     *
+     * If not set, default to 'none'
+     *
+     * @param string $zeroTermQuery
+     *
+     * @return $this
+     */
+    public function setZeroTermsQuery($zeroTermQuery = 'none')
+    {
+        return $this->setParam('zero_terms_query', $zeroTermQuery);
+    }
+
+    /**
+     * Set cutoff frequency for Match Query.
+     *
+     * @param float $cutoffFrequency
+     *
+     * @return $this
+     */
+    public function setCutoffFrequency($cutoffFrequency)
+    {
+        return $this->setParam('cutoff_frequency', $cutoffFrequency);
+    }
+
+    /**
+     * Set type.
+     *
+     * @param string $type
+     *
+     * @return $this
+     */
+    public function setType($type)
+    {
+        return $this->setParam('type', $type);
+    }
+
+    /**
+     * Set fuzziness.
+     *
+     * @param float|string $fuzziness
+     *
+     * @return $this
+     */
+    public function setFuzziness($fuzziness)
+    {
+        return $this->setParam('fuzziness', $fuzziness);
+    }
+
+    /**
+     * Set prefix length.
+     *
+     * @param int $prefixLength
+     *
+     * @return $this
+     */
+    public function setPrefixLength($prefixLength)
+    {
+        return $this->setParam('prefix_length', (int) $prefixLength);
+    }
+
+    /**
+     * Set max expansions.
+     *
+     * @param int $maxExpansions
+     *
+     * @return $this
+     */
+    public function setMaxExpansions($maxExpansions)
+    {
+        return $this->setParam('max_expansions', (int) $maxExpansions);
+    }
+
+    /**
+     * Set analyzer.
+     *
+     * @param string $analyzer
+     *
+     * @return $this
+     */
+    public function setAnalyzer($analyzer)
+    {
+        return $this->setParam('analyzer', $analyzer);
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Nested.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Nested.php
index 3d2f2f6..c8952de 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Nested.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Nested.php
@@ -3,20 +3,20 @@
 namespace Elastica\Query;
 
 /**
- * Nested query
+ * Nested query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/nested-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-nested-query.html
  */
 class Nested extends AbstractQuery
 {
     /**
-     * Adds field to mlt query
+     * Adds field to mlt query.
+     *
+     * @param string $path Nested object path
      *
-     * @param  string                     $path Nested object path
-     * @return \Elastica\Query\Nested
+     * @return $this
      */
     public function setPath($path)
     {
@@ -24,21 +24,23 @@ public function setPath($path)
     }
 
     /**
-     * Sets nested query
+     * Sets nested query.
      *
-     * @param  \Elastica\Query\AbstractQuery $query
-     * @return \Elastica\Query\Nested
+     * @param \Elastica\Query\AbstractQuery $query
+     *
+     * @return $this
      */
     public function setQuery(AbstractQuery $query)
     {
-        return $this->setParam('query', $query->toArray());
+        return $this->setParam('query', $query);
     }
 
     /**
-     * Set score method
+     * Set score method.
+     *
+     * @param string $scoreMode Options: avg, total, max and none.
      *
-     * @param  string                     $scoreMode Options: avg, total, max and none.
-     * @return \Elastica\Query\Nested
+     * @return $this
      */
     public function setScoreMode($scoreMode)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/NumericRange.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/NumericRange.php
new file mode 100755
index 0000000..fa074a7
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/NumericRange.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Numeric Range Query.
+ *
+ * @author Nicolas Ruflin <spam@ruflin.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-query.html
+ */
+class NumericRange extends Range
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Prefix.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Prefix.php
index 4306fd9..51a12ea 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Prefix.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Prefix.php
@@ -3,16 +3,14 @@
 namespace Elastica\Query;
 
 /**
- * Prefix query
+ * Prefix query.
  *
- * @category Xodoa
- * @package Elastica
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/prefix-query.html
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-prefix-query.html
  */
 class Prefix extends AbstractQuery
 {
     /**
-     * Constructs the Prefix query object
+     * Constructs the Prefix query object.
      *
      * @param array $prefix OPTIONAL Calls setRawPrefix with the given $prefix array
      */
@@ -25,8 +23,9 @@ public function __construct(array $prefix = array())
      * setRawPrefix can be used instead of setPrefix if some more special
      * values for a prefix have to be set.
      *
-     * @param  array                      $prefix Prefix array
-     * @return \Elastica\Query\Prefix Current object
+     * @param array $prefix Prefix array
+     *
+     * @return $this
      */
     public function setRawPrefix(array $prefix)
     {
@@ -34,12 +33,13 @@ public function setRawPrefix(array $prefix)
     }
 
     /**
-     * Adds a prefix to the prefix query
+     * Adds a prefix to the prefix query.
+     *
+     * @param string       $key   Key to query
+     * @param string|array $value Values(s) for the query. Boost can be set with array
+     * @param float        $boost OPTIONAL Boost value (default = 1.0)
      *
-     * @param  string                     $key   Key to query
-     * @param  string|array               $value Values(s) for the query. Boost can be set with array
-     * @param  float                      $boost OPTIONAL Boost value (default = 1.0)
-     * @return \Elastica\Query\Prefix Current object
+     * @return $this
      */
     public function setPrefix($key, $value, $boost = 1.0)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/QueryString.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/QueryString.php
index 8711ae6..be6d731 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/QueryString.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/QueryString.php
@@ -1,27 +1,27 @@
 <?php
 
 namespace Elastica\Query;
+
 use Elastica\Exception\InvalidException;
 
 /**
- * QueryString query
+ * QueryString query.
  *
- * @category Xodoa
- * @package  Elastica
  * @author   Nicolas Ruflin <spam@ruflin.com>, Jasper van Wanrooy <jasper@vanwanrooy.net>
- * @link     http://www.elasticsearch.org/guide/reference/query-dsl/query-string-query.html
+ *
+ * @link     https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html
  */
 class QueryString extends AbstractQuery
 {
     /**
-     * Query string
+     * Query string.
      *
      * @var string Query string
      */
     protected $_queryString = '';
 
     /**
-     * Creates query string object. Calls setQuery with argument
+     * Creates query string object. Calls setQuery with argument.
      *
      * @param string $queryString OPTIONAL Query string for object
      */
@@ -31,11 +31,13 @@ public function __construct($queryString = '')
     }
 
     /**
-     * Sets a new query string for the object
+     * Sets a new query string for the object.
+     *
+     * @param string $query Query string
      *
-     * @param  string                              $query Query string
-     * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Query\QueryString     Current object
+     * @throws \Elastica\Exception\InvalidException If given parameter is not a string
+     *
+     * @return $this
      */
     public function setQuery($query = '')
     {
@@ -47,12 +49,13 @@ public function setQuery($query = '')
     }
 
     /**
-     * Sets the default field
+     * Sets the default field.
      *
      * If no field is set, _all is chosen
      *
-     * @param  string                          $field Field
-     * @return \Elastica\Query\QueryString Current object
+     * @param string $field Field
+     *
+     * @return $this
      */
     public function setDefaultField($field)
     {
@@ -60,12 +63,13 @@ public function setDefaultField($field)
     }
 
     /**
-     * Sets the default operator AND or OR
+     * Sets the default operator AND or OR.
      *
      * If no operator is set, OR is chosen
      *
-     * @param  string                          $operator Operator
-     * @return \Elastica\Query\QueryString Current object
+     * @param string $operator Operator
+     *
+     * @return $this
      */
     public function setDefaultOperator($operator)
     {
@@ -75,8 +79,9 @@ public function setDefaultOperator($operator)
     /**
      * Sets the analyzer to analyze the query with.
      *
-     * @param  string                          $analyzer Analyser to use
-     * @return \Elastica\Query\QueryString Current object
+     * @param string $analyzer Analyser to use
+     *
+     * @return $this
      */
     public function setAnalyzer($analyzer)
     {
@@ -88,34 +93,23 @@ public function setAnalyzer($analyzer)
      *
      * If not set, defaults to true.
      *
-     * @param  bool                            $allow
-     * @return \Elastica\Query\QueryString Current object
+     * @param bool $allow
+     *
+     * @return $this
      */
     public function setAllowLeadingWildcard($allow = true)
     {
         return $this->setParam('allow_leading_wildcard', (bool) $allow);
     }
 
-    /**
-     * Sets the parameter to auto-lowercase terms of some queries.
-     *
-     * If not set, defaults to true.
-     *
-     * @param  bool                            $lowercase
-     * @return \Elastica\Query\QueryString Current object
-     */
-    public function setLowercaseExpandedTerms($lowercase = true)
-    {
-        return $this->setParam('lowercase_expanded_terms', (bool) $lowercase);
-    }
-
     /**
      * Sets the parameter to enable the position increments in result queries.
      *
      * If not set, defaults to true.
      *
-     * @param  bool                            $enabled
-     * @return \Elastica\Query\QueryString Current object
+     * @param bool $enabled
+     *
+     * @return $this
      */
     public function setEnablePositionIncrements($enabled = true)
     {
@@ -127,8 +121,9 @@ public function setEnablePositionIncrements($enabled = true)
      *
      * If not set, defaults to 0.
      *
-     * @param  int                             $length
-     * @return \Elastica\Query\QueryString Current object
+     * @param int $length
+     *
+     * @return $this
      */
     public function setFuzzyPrefixLength($length = 0)
     {
@@ -140,8 +135,9 @@ public function setFuzzyPrefixLength($length = 0)
      *
      * If not set, defaults to 0.5
      *
-     * @param  float                           $minSim
-     * @return \Elastica\Query\QueryString Current object
+     * @param float $minSim
+     *
+     * @return $this
      */
     public function setFuzzyMinSim($minSim = 0.5)
     {
@@ -154,8 +150,9 @@ public function setFuzzyMinSim($minSim = 0.5)
      * If zero, exact phrases are required.
      * If not set, defaults to zero.
      *
-     * @param  int                             $phraseSlop
-     * @return \Elastica\Query\QueryString Current object
+     * @param int $phraseSlop
+     *
+     * @return $this
      */
     public function setPhraseSlop($phraseSlop = 0)
     {
@@ -167,8 +164,9 @@ public function setPhraseSlop($phraseSlop = 0)
      *
      * If not set, defaults to 1.0.
      *
-     * @param  float                           $boost
-     * @return \Elastica\Query\QueryString Current object
+     * @param float $boost
+     *
+     * @return $this
      */
     public function setBoost($boost = 1.0)
     {
@@ -178,10 +176,11 @@ public function setBoost($boost = 1.0)
     /**
      * Allows analyzing of wildcard terms.
      *
-     * If not set, defaults to false
+     * If not set, defaults to true
      *
-     * @param  bool                            $analyze
-     * @return \Elastica\Query\QueryString Current object
+     * @param bool $analyze
+     *
+     * @return $this
      */
     public function setAnalyzeWildcard($analyze = true)
     {
@@ -191,10 +190,11 @@ public function setAnalyzeWildcard($analyze = true)
     /**
      * Sets the param to automatically generate phrase queries.
      *
-     * If not set, defaults to false.
+     * If not set, defaults to true.
      *
-     * @param  bool                            $autoGenerate
-     * @return \Elastica\Query\QueryString Current object
+     * @param bool $autoGenerate
+     *
+     * @return $this
      */
     public function setAutoGeneratePhraseQueries($autoGenerate = true)
     {
@@ -202,13 +202,13 @@ public function setAutoGeneratePhraseQueries($autoGenerate = true)
     }
 
     /**
-     * Sets the fields
+     * Sets the fields. If no fields are set, _all is chosen.
+     *
+     * @param array $fields Fields
      *
-     * If no fields are set, _all is chosen
+     * @throws \Elastica\Exception\InvalidException If given parameter is not an array
      *
-     * @param  array                               $fields Fields
-     * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Query\QueryString     Current object
+     * @return $this
      */
     public function setFields(array $fields)
     {
@@ -222,8 +222,9 @@ public function setFields(array $fields)
     /**
      * Whether to use bool or dis_max queries to internally combine results for multi field search.
      *
-     * @param  bool                            $value Determines whether to use
-     * @return \Elastica\Query\QueryString Current object
+     * @param bool $value Determines whether to use
+     *
+     * @return $this
      */
     public function setUseDisMax($value = true)
     {
@@ -235,8 +236,9 @@ public function setUseDisMax($value = true)
      *
      * If not set, defaults to 0.
      *
-     * @param  int                             $tieBreaker
-     * @return \Elastica\Query\QueryString Current object
+     * @param int $tieBreaker
+     *
+     * @return $this
      */
     public function setTieBreaker($tieBreaker = 0)
     {
@@ -244,24 +246,38 @@ public function setTieBreaker($tieBreaker = 0)
     }
 
     /**
-     * Set a re-write condition. See https://github.com/elasticsearch/elasticsearch/issues/1186 for additional information
+     * Set a re-write condition. See https://github.com/elasticsearch/elasticsearch/issues/1186 for additional information.
      *
-     * @param  string                          $rewrite
-     * @return \Elastica\Query\QueryString Current object
+     * @param string $rewrite
+     *
+     * @return $this
      */
-    public function setRewrite($rewrite = "")
+    public function setRewrite($rewrite = '')
     {
         return $this->setParam('rewrite', $rewrite);
     }
 
     /**
-     * Converts query to array
+     * Set timezone option.
+     *
+     * @param string $timezone
+     *
+     * @return $this
+     */
+    public function setTimezone($timezone)
+    {
+        return $this->setParam('time_zone', $timezone);
+    }
+
+    /**
+     * Converts query to array.
      *
      * @see \Elastica\Query\AbstractQuery::toArray()
+     *
      * @return array Query array
      */
     public function toArray()
     {
-        return array('query_string' => array_merge(array('query' => $this->_queryString), $this->getParams()),);
+        return array('query_string' => array_merge(array('query' => $this->_queryString), $this->getParams()));
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Range.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Range.php
index 54b7902..19117af 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Range.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Range.php
@@ -3,17 +3,16 @@
 namespace Elastica\Query;
 
 /**
- * Range query
+ * Range query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/range-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-query.html
  */
 class Range extends AbstractQuery
 {
     /**
-     * Constructor
+     * Constructor.
      *
      * @param string $fieldName Field name
      * @param array  $args      Field arguments
@@ -26,11 +25,12 @@ public function __construct($fieldName = null, array $args = array())
     }
 
     /**
-     * Adds a range field to the query
+     * Adds a range field to the query.
+     *
+     * @param string $fieldName Field name
+     * @param array  $args      Field arguments
      *
-     * @param  string                    $fieldName Field name
-     * @param  array                     $args      Field arguments
-     * @return \Elastica\Query\Range Current object
+     * @return $this
      */
     public function addField($fieldName, array $args)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Regexp.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Regexp.php
new file mode 100755
index 0000000..73e5af0
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Regexp.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Regexp query.
+ *
+ * @author Aurélien Le Grand <gnitg@yahoo.fr>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html
+ */
+class Regexp extends AbstractQuery
+{
+    /**
+     * Construct regexp query.
+     *
+     * @param string $key   OPTIONAL Regexp key
+     * @param string $value OPTIONAL Regexp value
+     * @param float  $boost OPTIONAL Boost value (default = 1)
+     */
+    public function __construct($key = '', $value = null, $boost = 1.0)
+    {
+        if (!empty($key)) {
+            $this->setValue($key, $value, $boost);
+        }
+    }
+
+    /**
+     * Sets the query expression for a key with its boost value.
+     *
+     * @param string $key
+     * @param string $value
+     * @param float  $boost
+     *
+     * @return $this
+     */
+    public function setValue($key, $value, $boost = 1.0)
+    {
+        return $this->setParam($key, array('value' => $value, 'boost' => $boost));
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Script.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Script.php
new file mode 100755
index 0000000..bb872e6
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Script.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Elastica\Query;
+
+use Elastica;
+
+/**
+ * Script query.
+ *
+ * @author Nicolas Ruflin <spam@ruflin.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-script-query.html
+ */
+class Script extends AbstractQuery
+{
+    /**
+     * Query object.
+     *
+     * @var array|AbstractQuery
+     */
+    protected $_query = null;
+
+    /**
+     * Construct script query.
+     *
+     * @param array|string|\Elastica\Script\AbstractScript $script OPTIONAL Script
+     */
+    public function __construct($script = null)
+    {
+        if ($script) {
+            $this->setScript($script);
+        }
+    }
+
+    /**
+     * Sets script object.
+     *
+     * @param \Elastica\Script\Script|string|array $script
+     *
+     * @return $this
+     */
+    public function setScript($script)
+    {
+        return $this->setParam('script', Elastica\Script\Script::create($script));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        if (isset($array['script'])) {
+            $array['script'] = $array['script']['script'];
+        }
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Simple.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Simple.php
index 2448ca7..58d3729 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Simple.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Simple.php
@@ -6,21 +6,19 @@
  * Simple query
  * Pure php array query. Can be used to create any not existing type of query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class Simple extends AbstractQuery
 {
     /**
-     * Query
+     * Query.
      *
      * @var array Query
      */
     protected $_query = array();
 
     /**
-     * Constructs a query based on an array
+     * Constructs a query based on an array.
      *
      * @param array $query Query array
      */
@@ -30,10 +28,11 @@ public function __construct(array $query)
     }
 
     /**
-     * Sets new query array
+     * Sets new query array.
      *
-     * @param  array                     $query Query array
-     * @return \Elastica\Query\Simple Current object
+     * @param array $query Query array
+     *
+     * @return $this
      */
     public function setQuery(array $query)
     {
@@ -43,9 +42,10 @@ public function setQuery(array $query)
     }
 
     /**
-     * Converts query to array
+     * Converts query to array.
      *
      * @return array Query array
+     *
      * @see \Elastica\Query\AbstractQuery::toArray()
      */
     public function toArray()
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/SimpleQueryString.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/SimpleQueryString.php
new file mode 100755
index 0000000..2f443e9
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/SimpleQueryString.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Class SimpleQueryString.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-simple-query-string-query.html
+ */
+class SimpleQueryString extends AbstractQuery
+{
+    const OPERATOR_AND = 'and';
+    const OPERATOR_OR = 'or';
+
+    /**
+     * @param string $query
+     * @param array  $fields
+     */
+    public function __construct($query, array $fields = array())
+    {
+        $this->setQuery($query);
+        if (sizeof($fields)) {
+            $this->setFields($fields);
+        }
+    }
+
+    /**
+     * Set the querystring for this query.
+     *
+     * @param string $query see ES documentation for querystring syntax
+     *
+     * @return $this
+     */
+    public function setQuery($query)
+    {
+        return $this->setParam('query', $query);
+    }
+
+    /**
+     * @param string[] $fields the fields on which to perform this query. Defaults to index.query.default_field.
+     *
+     * @return $this
+     */
+    public function setFields(array $fields)
+    {
+        return $this->setParam('fields', $fields);
+    }
+
+    /**
+     * Set the default operator to use if no explicit operator is defined in the query string.
+     *
+     * @param string $operator see OPERATOR_* constants for options
+     *
+     * @return $this
+     */
+    public function setDefaultOperator($operator)
+    {
+        return $this->setParam('default_operator', $operator);
+    }
+
+    /**
+     * Set the analyzer used to analyze each term of the query.
+     *
+     * @param string $analyzer
+     *
+     * @return $this
+     */
+    public function setAnalyzer($analyzer)
+    {
+        return $this->setParam('analyzer', $analyzer);
+    }
+
+    /**
+     * Set minimum_should_match option.
+     *
+     * @param int|string $minimumShouldMatch
+     *
+     * @return $this
+     */
+    public function setMinimumShouldMatch($minimumShouldMatch)
+    {
+        return $this->setParam('minimum_should_match', $minimumShouldMatch);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Term.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Term.php
index eb20eb8..8ca6dec 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Term.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Term.php
@@ -3,17 +3,16 @@
 namespace Elastica\Query;
 
 /**
- * Term query
+ * Term query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/term-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-query.html
  */
 class Term extends AbstractQuery
 {
     /**
-     * Constructs the Term query object
+     * Constructs the Term query object.
      *
      * @param array $term OPTIONAL Calls setTerm with the given $term array
      */
@@ -26,8 +25,9 @@ public function __construct(array $term = array())
      * Set term can be used instead of addTerm if some more special
      * values for a term have to be set.
      *
-     * @param  array                    $term Term array
-     * @return \Elastica\Query\Term Current object
+     * @param array $term Term array
+     *
+     * @return $this
      */
     public function setRawTerm(array $term)
     {
@@ -35,12 +35,13 @@ public function setRawTerm(array $term)
     }
 
     /**
-     * Adds a term to the term query
+     * Adds a term to the term query.
+     *
+     * @param string       $key   Key to query
+     * @param string|array $value Values(s) for the query. Boost can be set with array
+     * @param float        $boost OPTIONAL Boost value (default = 1.0)
      *
-     * @param  string                   $key   Key to query
-     * @param  string|array             $value Values(s) for the query. Boost can be set with array
-     * @param  float                    $boost OPTIONAL Boost value (default = 1.0)
-     * @return \Elastica\Query\Term Current object
+     * @return $this
      */
     public function setTerm($key, $value, $boost = 1.0)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Terms.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Terms.php
index 41cc921..fd4f1af 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Terms.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Terms.php
@@ -1,41 +1,41 @@
 <?php
 
 namespace Elastica\Query;
+
 use Elastica\Exception\InvalidException;
 
 /**
- * Terms query
+ * Terms query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/terms-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-query.html
  */
 class Terms extends AbstractQuery
 {
     /**
-     * Terms
+     * Terms.
      *
      * @var array Terms
      */
     protected $_terms = array();
 
     /**
-     * Params
+     * Params.
      *
      * @var array Params
      */
     protected $_params = array();
 
     /**
-     * Terms key
+     * Terms key.
      *
      * @var string Terms key
      */
     protected $_key = '';
 
     /**
-     * Construct terms query
+     * Construct terms query.
      *
      * @param string $key   OPTIONAL Terms key
      * @param array  $terms OPTIONAL Terms list
@@ -46,11 +46,12 @@ public function __construct($key = '', array $terms = array())
     }
 
     /**
-     * Sets key and terms for the query
+     * Sets key and terms for the query.
      *
-     * @param  string                    $key   Terms key
-     * @param  array                     $terms Terms for the query.
-     * @return \Elastica\Query\Terms
+     * @param string $key   Terms key
+     * @param array  $terms Terms for the query.
+     *
+     * @return $this
      */
     public function setTerms($key, array $terms)
     {
@@ -61,10 +62,11 @@ public function setTerms($key, array $terms)
     }
 
     /**
-     * Adds a single term to the list
+     * Adds a single term to the list.
+     *
+     * @param string $term Term
      *
-     * @param  string                    $term Term
-     * @return \Elastica\Query\Terms
+     * @return $this
      */
     public function addTerm($term)
     {
@@ -74,10 +76,11 @@ public function addTerm($term)
     }
 
     /**
-     * Sets the minimum matching values
+     * Sets the minimum matching values.
      *
-     * @param  int                       $minimum Minimum value
-     * @return \Elastica\Query\Terms
+     * @param int $minimum Minimum value
+     *
+     * @return $this
      */
     public function setMinimumMatch($minimum)
     {
@@ -85,11 +88,13 @@ public function setMinimumMatch($minimum)
     }
 
     /**
-     * Converts the terms object to an array
+     * Converts the terms object to an array.
      *
      * @see \Elastica\Query\AbstractQuery::toArray()
-     * @throws \Elastica\Exception\InvalidException
-     * @return array                               Query array
+     *
+     * @throws \Elastica\Exception\InvalidException If term key is empty
+     *
+     * @return array Query array
      */
     public function toArray()
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/TopChildren.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/TopChildren.php
index 5547c23..c498098 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/TopChildren.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/TopChildren.php
@@ -1,23 +1,23 @@
 <?php
 
 namespace Elastica\Query;
+
 use Elastica\Query as BaseQuery;
 
 /**
  * Runs the child query with an estimated hits size, and out of the hit docs, aggregates it into parent docs.
  *
- * @category Xodoa
- * @package Elastica
  * @author Wu Yang <darkyoung@gmail.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/top-children-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-top-children-query.html
  */
 class TopChildren extends AbstractQuery
 {
     /**
-     * Construct topChildren query
+     * Construct topChildren query.
      *
-     * @param string|\Elastica\Query $query Query string or a Elastica\Query object
-     * @param string                $type  Parent document type
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
+     * @param string                                               $type  Parent document type
      */
     public function __construct($query, $type = null)
     {
@@ -26,24 +26,23 @@ public function __construct($query, $type = null)
     }
 
     /**
-     * Sets query object
+     * Sets query object.
+     *
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
      *
-     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
-     * @return \Elastica\Query\TopChildren
+     * @return $this
      */
     public function setQuery($query)
     {
-        $query = BaseQuery::create($query);
-        $data = $query->toArray();
-
-        return $this->setParam('query', $data['query']);
+        return $this->setParam('query', BaseQuery::create($query));
     }
 
     /**
-     * Set type of the parent document
+     * Set type of the parent document.
+     *
+     * @param string $type Parent document type
      *
-     * @param  string                          $type Parent document type
-     * @return \Elastica\Query\TopChildren Current object
+     * @return $this
      */
     public function setType($type)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Type.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Type.php
new file mode 100755
index 0000000..2e4a073
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Type.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Elastica\Query;
+
+/**
+ * Type Query.
+ *
+ * @author James Wilson <jwilson556@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-type-query.html
+ */
+class Type extends AbstractQuery
+{
+    /**
+     * Type name.
+     *
+     * @var string
+     */
+    protected $_type = null;
+
+    /**
+     * Construct Type Query.
+     *
+     * @param string $type Type name
+     */
+    public function __construct($type = null)
+    {
+        if ($type) {
+            $this->setType($type);
+        }
+    }
+
+    /**
+     * Ads a field with arguments to the range query.
+     *
+     * @param string $typeName Type name
+     *
+     * @return $this
+     */
+    public function setType($typeName)
+    {
+        $this->_type = $typeName;
+
+        return $this;
+    }
+
+    /**
+     * Convert object to array.
+     *
+     * @see \Elastica\Query\AbstractQuery::toArray()
+     *
+     * @return array Query array
+     */
+    public function toArray()
+    {
+        return array(
+            'type' => array('value' => $this->_type),
+        );
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Wildcard.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Wildcard.php
index 68aca67..58e5d00 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Wildcard.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Query/Wildcard.php
@@ -3,17 +3,16 @@
 namespace Elastica\Query;
 
 /**
- * Wildcard query
+ * Wildcard query.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/wildcard-query.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-wildcard-query.html
  */
 class Wildcard extends AbstractQuery
 {
     /**
-     * Construct wildcard query
+     * Construct wildcard query.
      *
      * @param string $key   OPTIONAL Wildcard key
      * @param string $value OPTIONAL Wildcard value
@@ -27,12 +26,13 @@ public function __construct($key = '', $value = null, $boost = 1.0)
     }
 
     /**
-     * Sets the query expression for a key with its boost value
+     * Sets the query expression for a key with its boost value.
+     *
+     * @param string $key
+     * @param string $value
+     * @param float  $boost
      *
-     * @param  string                       $key
-     * @param  string                       $value
-     * @param  float                        $boost
-     * @return \Elastica\Query\Wildcard
+     * @return $this
      */
     public function setValue($key, $value, $boost = 1.0)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder.php
new file mode 100755
index 0000000..5f96053
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Elastica;
+
+use Elastica\Exception\QueryBuilderException;
+use Elastica\QueryBuilder\DSL;
+use Elastica\QueryBuilder\Facade;
+use Elastica\QueryBuilder\Version;
+
+/**
+ * Query Builder.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+class QueryBuilder
+{
+    /**
+     * @var Version
+     */
+    private $_version;
+
+    /**
+     * @var Facade[]
+     */
+    private $_facades = array();
+
+    /**
+     * Constructor.
+     *
+     * @param Version $version
+     */
+    public function __construct(Version $version = null)
+    {
+        $this->_version = $version ?: new Version\Latest();
+
+        $this->addDSL(new DSL\Query());
+        $this->addDSL(new DSL\Filter());
+        $this->addDSL(new DSL\Aggregation());
+        $this->addDSL(new DSL\Suggest());
+    }
+
+    /**
+     * Returns Facade for custom DSL object.
+     *
+     * @param $dsl
+     * @param array $arguments
+     *
+     * @throws QueryBuilderException
+     *
+     * @return Facade
+     */
+    public function __call($dsl, array $arguments)
+    {
+        if (false === isset($this->_facades[$dsl])) {
+            throw new QueryBuilderException('DSL "'.$dsl.'" not supported');
+        }
+
+        return $this->_facades[$dsl];
+    }
+
+    /**
+     * Adds a new DSL object.
+     *
+     * @param DSL $dsl
+     */
+    public function addDSL(DSL $dsl)
+    {
+        $this->_facades[$dsl->getType()] = new Facade($dsl, $this->_version);
+    }
+
+    /*
+     * convenience methods
+     */
+
+    /**
+     * Query DSL.
+     *
+     * @return DSL\Query
+     */
+    public function query()
+    {
+        return $this->_facades[DSL::TYPE_QUERY];
+    }
+
+    /**
+     * Filter DSL.
+     *
+     * @return DSL\Filter
+     */
+    public function filter()
+    {
+        return $this->_facades[DSL::TYPE_FILTER];
+    }
+
+    /**
+     * Aggregation DSL.
+     *
+     * @return DSL\Aggregation
+     */
+    public function aggregation()
+    {
+        return $this->_facades[DSL::TYPE_AGGREGATION];
+    }
+
+    /**
+     * Suggest DSL.
+     *
+     * @return DSL\Suggest
+     */
+    public function suggest()
+    {
+        return $this->_facades[DSL::TYPE_SUGGEST];
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL.php
new file mode 100755
index 0000000..9076ad5
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Elastica\QueryBuilder;
+
+/**
+ * DSL Interface.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+interface DSL
+{
+    const TYPE_QUERY = 'query';
+    const TYPE_FILTER = 'filter';
+    const TYPE_AGGREGATION = 'aggregation';
+    const TYPE_SUGGEST = 'suggest';
+
+    /**
+     * must return type for QueryBuilder usage.
+     *
+     * @return string
+     */
+    public function getType();
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Aggregation.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Aggregation.php
new file mode 100755
index 0000000..fc524a8
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Aggregation.php
@@ -0,0 +1,471 @@
+<?php
+
+namespace Elastica\QueryBuilder\DSL;
+
+use Elastica\Aggregation\Avg;
+use Elastica\Aggregation\Cardinality;
+use Elastica\Aggregation\DateHistogram;
+use Elastica\Aggregation\DateRange;
+use Elastica\Aggregation\ExtendedStats;
+use Elastica\Aggregation\Filter as FilterAggregation;
+use Elastica\Aggregation\Filters;
+use Elastica\Aggregation\GeoDistance;
+use Elastica\Aggregation\GeohashGrid;
+use Elastica\Aggregation\GlobalAggregation;
+use Elastica\Aggregation\Histogram;
+use Elastica\Aggregation\IpRange;
+use Elastica\Aggregation\Max;
+use Elastica\Aggregation\Min;
+use Elastica\Aggregation\Missing;
+use Elastica\Aggregation\Nested;
+use Elastica\Aggregation\Percentiles;
+use Elastica\Aggregation\Range;
+use Elastica\Aggregation\ReverseNested;
+use Elastica\Aggregation\ScriptedMetric;
+use Elastica\Aggregation\SignificantTerms;
+use Elastica\Aggregation\Stats;
+use Elastica\Aggregation\Sum;
+use Elastica\Aggregation\Terms;
+use Elastica\Aggregation\TopHits;
+use Elastica\Aggregation\ValueCount;
+use Elastica\Exception\NotImplementedException;
+use Elastica\Filter\AbstractFilter;
+use Elastica\QueryBuilder\DSL;
+
+/**
+ * elasticsearch aggregation DSL.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html
+ */
+class Aggregation implements DSL
+{
+    /**
+     * must return type for QueryBuilder usage.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return DSL::TYPE_AGGREGATION;
+    }
+
+    /**
+     * min aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-min-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return Min
+     */
+    public function min($name)
+    {
+        return new Min($name);
+    }
+
+    /**
+     * max aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-max-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return Max
+     */
+    public function max($name)
+    {
+        return new Max($name);
+    }
+
+    /**
+     * sum aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-sum-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return Sum
+     */
+    public function sum($name)
+    {
+        return new Sum($name);
+    }
+
+    /**
+     * avg aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-avg-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return Avg
+     */
+    public function avg($name)
+    {
+        return new Avg($name);
+    }
+
+    /**
+     * stats aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-stats-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return Stats
+     */
+    public function stats($name)
+    {
+        return new Stats($name);
+    }
+
+    /**
+     * extended stats aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-extendedstats-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return ExtendedStats
+     */
+    public function extended_stats($name)
+    {
+        return new ExtendedStats($name);
+    }
+
+    /**
+     * value count aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-valuecount-aggregation.html
+     *
+     * @param string $name
+     * @param string $field
+     *
+     * @return ValueCount
+     */
+    public function value_count($name, $field)
+    {
+        return new ValueCount($name, $field);
+    }
+
+    /**
+     * percentiles aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-percentile-aggregation.html
+     *
+     * @param string $name  the name of this aggregation
+     * @param string $field the field on which to perform this aggregation
+     *
+     * @return Percentiles
+     */
+    public function percentiles($name, $field = null)
+    {
+        return new Percentiles($name, $field);
+    }
+
+    /**
+     * percentile ranks aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-percentile-rank-aggregation.html
+     *
+     * @param string $name
+     */
+    public function percentile_ranks($name)
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * cardinality aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-cardinality-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return Cardinality
+     */
+    public function cardinality($name)
+    {
+        return new Cardinality($name);
+    }
+
+    /**
+     * geo bounds aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-geobounds-aggregation.html
+     *
+     * @param string $name
+     */
+    public function geo_bounds($name)
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * top hits aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-top-hits-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return TopHits
+     */
+    public function top_hits($name)
+    {
+        return new TopHits($name);
+    }
+
+    /**
+     * scripted metric aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-scripted-metric-aggregation.html
+     *
+     * @param string      $name
+     * @param string|null $initScript
+     * @param string|null $mapScript
+     * @param string|null $combineScript
+     * @param string|null $reduceScript
+     *
+     * @return ScriptedMetric
+     */
+    public function scripted_metric($name, $initScript = null, $mapScript = null, $combineScript = null, $reduceScript = null)
+    {
+        return new ScriptedMetric($name, $initScript, $mapScript, $combineScript, $reduceScript);
+    }
+
+    /**
+     * global aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-global-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return GlobalAggregation
+     */
+    public function global_agg($name)
+    {
+        return new GlobalAggregation($name);
+    }
+
+    /**
+     * filter aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filter-aggregation.html
+     *
+     * @param string         $name
+     * @param AbstractFilter $filter
+     *
+     * @return FilterAggregation
+     */
+    public function filter($name, $filter = null)
+    {
+        return new FilterAggregation($name, $filter);
+    }
+
+    /**
+     * filters aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filters-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return Filters
+     */
+    public function filters($name)
+    {
+        return new Filters($name);
+    }
+
+    /**
+     * missing aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-missing-aggregation.html
+     *
+     * @param string $name
+     * @param string $field
+     *
+     * @return Missing
+     */
+    public function missing($name, $field)
+    {
+        return new Missing($name, $field);
+    }
+
+    /**
+     * nested aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-nested-aggregation.html
+     *
+     * @param string $name
+     * @param string $path the nested path for this aggregation
+     *
+     * @return Nested
+     */
+    public function nested($name, $path)
+    {
+        return new Nested($name, $path);
+    }
+
+    /**
+     * reverse nested aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-reverse-nested-aggregation.html
+     *
+     * @param string $name The name of this aggregation
+     * @param string $path Optional path to the nested object for this aggregation. Defaults to the root of the main document.
+     *
+     * @return ReverseNested
+     */
+    public function reverse_nested($name, $path = null)
+    {
+        return new ReverseNested($name);
+    }
+
+    /**
+     * children aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-children-aggregation.html
+     *
+     * @param string $name
+     */
+    public function children($name)
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * terms aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-terms-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return Terms
+     */
+    public function terms($name)
+    {
+        return new Terms($name);
+    }
+
+    /**
+     * significant terms aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-significantterms-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return SignificantTerms
+     */
+    public function significant_terms($name)
+    {
+        return new SignificantTerms($name);
+    }
+
+    /**
+     * range aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-range-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return Range
+     */
+    public function range($name)
+    {
+        return new Range($name);
+    }
+
+    /**
+     * date range aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-daterange-aggregation.html
+     *
+     * @param string $name
+     *
+     * @return DateRange
+     */
+    public function date_range($name)
+    {
+        return new DateRange($name);
+    }
+
+    /**
+     * ipv4 range aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-iprange-aggregation.html
+     *
+     * @param string $name
+     * @param string $field
+     *
+     * @return IpRange
+     */
+    public function ipv4_range($name, $field)
+    {
+        return new IpRange($name, $field);
+    }
+
+    /**
+     * histogram aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-histogram-aggregation.html
+     *
+     * @param string $name     the name of this aggregation
+     * @param string $field    the name of the field on which to perform the aggregation
+     * @param int    $interval the interval by which documents will be bucketed
+     *
+     * @return Histogram
+     */
+    public function histogram($name, $field, $interval)
+    {
+        return new Histogram($name, $field, $interval);
+    }
+
+    /**
+     * date histogram aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-datehistogram-aggregation.html
+     *
+     * @param string $name     the name of this aggregation
+     * @param string $field    the name of the field on which to perform the aggregation
+     * @param int    $interval the interval by which documents will be bucketed
+     *
+     * @return DateHistogram
+     */
+    public function date_histogram($name, $field, $interval)
+    {
+        return new DateHistogram($name, $field, $interval);
+    }
+
+    /**
+     * geo distance aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geodistance-aggregation.html
+     *
+     * @param string       $name   the name if this aggregation
+     * @param string       $field  the field on which to perform this aggregation
+     * @param string|array $origin the point from which distances will be calculated
+     *
+     * @return GeoDistance
+     */
+    public function geo_distance($name, $field, $origin)
+    {
+        return new GeoDistance($name, $field, $origin);
+    }
+
+    /**
+     * geohash grid aggregation.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html
+     *
+     * @param string $name  the name of this aggregation
+     * @param string $field the field on which to perform this aggregation
+     *
+     * @return GeohashGrid
+     */
+    public function geohash_grid($name, $field)
+    {
+        return new GeohashGrid($name, $field);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Filter.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Filter.php
new file mode 100755
index 0000000..93982f4
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Filter.php
@@ -0,0 +1,481 @@
+<?php
+
+namespace Elastica\QueryBuilder\DSL;
+
+use Elastica\Filter\AbstractFilter;
+use Elastica\Filter\BoolAnd;
+use Elastica\Filter\BoolFilter;
+use Elastica\Filter\BoolNot;
+use Elastica\Filter\BoolOr;
+use Elastica\Filter\Exists;
+use Elastica\Filter\GeoBoundingBox;
+use Elastica\Filter\GeoDistance;
+use Elastica\Filter\GeoDistanceRange;
+use Elastica\Filter\GeohashCell;
+use Elastica\Filter\GeoPolygon;
+use Elastica\Filter\GeoShapePreIndexed;
+use Elastica\Filter\GeoShapeProvided;
+use Elastica\Filter\HasChild;
+use Elastica\Filter\HasParent;
+use Elastica\Filter\Ids;
+use Elastica\Filter\Indices;
+use Elastica\Filter\Limit;
+use Elastica\Filter\MatchAll;
+use Elastica\Filter\Missing;
+use Elastica\Filter\Nested;
+use Elastica\Filter\NumericRange;
+use Elastica\Filter\Prefix;
+use Elastica\Filter\Query as QueryFilter;
+use Elastica\Filter\Range;
+use Elastica\Filter\Regexp;
+use Elastica\Filter\Script;
+use Elastica\Filter\Term;
+use Elastica\Filter\Terms;
+use Elastica\Filter\Type;
+use Elastica\Query\AbstractQuery;
+use Elastica\QueryBuilder\DSL;
+
+/**
+ * elasticsearch filter DSL.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-filters.html
+ */
+class Filter implements DSL
+{
+    /**
+     * must return type for QueryBuilder usage.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return self::TYPE_FILTER;
+    }
+
+    /**
+     * and filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-and-filter.html
+     *
+     * @param AbstractFilter[] $filters
+     *
+     * @return BoolAnd
+     */
+    public function bool_and(array $filters = array())
+    {
+        return new BoolAnd($filters);
+    }
+
+    /**
+     * bool filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html
+     *
+     * @return \Elastica\Filter\Bool
+     */
+    public function bool()
+    {
+        return new BoolFilter();
+    }
+
+    /**
+     * exists filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-filter.html
+     *
+     * @param string $field
+     *
+     * @return Exists
+     */
+    public function exists($field)
+    {
+        return new Exists($field);
+    }
+
+    /**
+     * geo bounding box filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-bounding-box-filter.html
+     *
+     * @param string $key
+     * @param array  $coordinates
+     *
+     * @return GeoBoundingBox
+     */
+    public function geo_bounding_box($key, array $coordinates)
+    {
+        return new GeoBoundingBox($key, $coordinates);
+    }
+
+    /**
+     * geo distance filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-filter.html
+     *
+     * @param string       $key      Key
+     * @param array|string $location Location as array or geohash: array('lat' => 48.86, 'lon' => 2.35) OR 'drm3btev3e86'
+     * @param string       $distance Distance
+     *
+     * @return GeoDistance
+     */
+    public function geo_distance($key, $location, $distance)
+    {
+        return new GeoDistance($key, $location, $distance);
+    }
+
+    /**
+     * geo distance rangefilter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-range-filter.html
+     *
+     * @param string       $key
+     * @param array|string $location
+     * @param array        $ranges
+     *
+     * @return GeoDistanceRange
+     */
+    public function geo_distance_range($key, $location, array $ranges = array())
+    {
+        return new GeoDistanceRange($key, $location, $ranges);
+    }
+
+    /**
+     * geo polygon filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-polygon-filter.html
+     *
+     * @param string $key    Key
+     * @param array  $points Points making up polygon
+     *
+     * @return GeoPolygon
+     */
+    public function geo_polygon($key, array $points)
+    {
+        return new GeoPolygon($key, $points);
+    }
+
+    /**
+     * provided geo shape filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html#_provided_shape_definition
+     *
+     * @param string $path
+     * @param array  $coordinates
+     * @param string $shapeType
+     *
+     * @return GeoShapeProvided
+     */
+    public function geo_shape_provided($path, array $coordinates, $shapeType = GeoShapeProvided::TYPE_ENVELOPE)
+    {
+        return new GeoShapeProvided($path, $coordinates, $shapeType);
+    }
+
+    /**
+     * pre indexed geo shape filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html#_pre_indexed_shape
+     *
+     * @param string $path         The path/field of the shape searched
+     * @param string $indexedId    Id of the pre-indexed shape
+     * @param string $indexedType  Type of the pre-indexed shape
+     * @param string $indexedIndex Index of the pre-indexed shape
+     * @param string $indexedPath  Path of the pre-indexed shape
+     *
+     * @return GeoShapePreIndexed
+     */
+    public function geo_shape_pre_indexed($path, $indexedId, $indexedType, $indexedIndex, $indexedPath)
+    {
+        return new GeoShapePreIndexed($path, $indexedId, $indexedType, $indexedIndex, $indexedPath);
+    }
+
+    /**
+     * geohash cell filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geohash-cell-filter.html
+     *
+     * @param string       $key       The field on which to filter
+     * @param array|string $location  Location as coordinates array or geohash string ['lat' => 40.3, 'lon' => 45.2]
+     * @param int|string   $precision length of geohash prefix or distance (3, or "50m")
+     * @param bool         $neighbors If true, filters cells next to the given cell.
+     *
+     * @return GeohashCell
+     */
+    public function geohash_cell($key, $location, $precision = -1, $neighbors = false)
+    {
+        return new GeohashCell($key, $location, $precision, $neighbors);
+    }
+
+    /**
+     * has child filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-child-filter.html
+     *
+     * @param AbstractQuery|AbstractFilter $query
+     * @param string                       $type
+     *
+     * @return HasChild
+     */
+    public function has_child($query, $type = null)
+    {
+        return new HasChild($query, $type);
+    }
+
+    /**
+     * has parent filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-parent-filter.html
+     *
+     * @param AbstractQuery|AbstractFilter $query
+     * @param string                       $type
+     *
+     * @return HasParent
+     */
+    public function has_parent($query, $type)
+    {
+        return new HasParent($query, $type);
+    }
+
+    /**
+     * ids filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-filter.html
+     *
+     * @param string|\Elastica\Type $type
+     * @param array                 $ids
+     *
+     * @return Ids
+     */
+    public function ids($type = null, array $ids = array())
+    {
+        return new Ids($type, $ids);
+    }
+
+    /**
+     * indices filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-indices-filter.html
+     *
+     * @param AbstractFilter $filter  filter which will be applied to docs in the specified indices
+     * @param string[]       $indices
+     *
+     * @return Indices
+     */
+    public function indices(AbstractFilter $filter, array $indices)
+    {
+        return new Indices($filter, $indices);
+    }
+
+    /**
+     * limit filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-limit-filter.html
+     *
+     * @param int $limit Limit
+     *
+     * @return Limit
+     */
+    public function limit($limit)
+    {
+        return new Limit($limit);
+    }
+
+    /**
+     * match all filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-all-filter.html
+     *
+     * @return MatchAll
+     */
+    public function match_all()
+    {
+        return new MatchAll();
+    }
+
+    /**
+     * missing filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-missing-filter.html
+     *
+     * @param string $field
+     *
+     * @return Missing
+     */
+    public function missing($field = '')
+    {
+        return new Missing($field);
+    }
+
+    /**
+     * nested filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-nested-filter.html
+     *
+     * @return Nested
+     */
+    public function nested()
+    {
+        return new Nested();
+    }
+
+    /**
+     * not filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-not-filter.html
+     *
+     * @param AbstractFilter $filter
+     *
+     * @return BoolNot
+     */
+    public function bool_not(AbstractFilter $filter)
+    {
+        return new BoolNot($filter);
+    }
+
+    /**
+     * numeric range filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/0.90/query-dsl-numeric-range-filter.html
+     *
+     * @param string $fieldName Field name
+     * @param array  $args      Field arguments
+     *
+     * @return NumericRange
+     */
+    public function numeric_range($fieldName = '', array $args = array())
+    {
+        return new NumericRange($fieldName, $args);
+    }
+
+    /**
+     * or filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-or-filter.html
+     *
+     * @param AbstractFilter[] $filters
+     *
+     * @return BoolOr
+     */
+    public function bool_or(array $filters = array())
+    {
+        return new BoolOr($filters);
+    }
+
+    /**
+     * prefix filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-prefix-filter.html
+     *
+     * @param string $field
+     * @param string $prefix
+     *
+     * @return Prefix
+     */
+    public function prefix($field = '', $prefix = '')
+    {
+        return new Prefix($field, $prefix);
+    }
+
+    /**
+     * query filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-filter.html
+     *
+     * @param array|AbstractQuery $query
+     *
+     * @return QueryFilter
+     */
+    public function query($query = null)
+    {
+        return new QueryFilter($query);
+    }
+
+    /**
+     * range filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html
+     *
+     * @param string $fieldName
+     * @param array  $args
+     *
+     * @return Range
+     */
+    public function range($fieldName = '', array $args = array())
+    {
+        return new Range($fieldName, $args);
+    }
+
+    /**
+     * regexp filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-filter.html
+     *
+     * @param string $field   Field name
+     * @param string $regexp  Regular expression
+     * @param array  $options Regular expression options
+     *
+     * @return Regexp
+     */
+    public function regexp($field = '', $regexp = '', $options = array())
+    {
+        return new Regexp($field, $regexp, $options);
+    }
+
+    /**
+     * script filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-script-filter.html
+     *
+     * @param array|string|\Elastica\Script\Script $script
+     *
+     * @return Script
+     */
+    public function script($script = null)
+    {
+        return new Script($script);
+    }
+
+    /**
+     * term filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html
+     *
+     * @param array $term
+     *
+     * @return Term
+     */
+    public function term(array $term = array())
+    {
+        return new Term($term);
+    }
+
+    /**
+     * terms filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-filter.html
+     *
+     * @param string $key
+     * @param array  $terms
+     *
+     * @return Terms
+     */
+    public function terms($key = '', array $terms = array())
+    {
+        return new Terms($key, $terms);
+    }
+
+    /**
+     * type filter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-type-filter.html
+     *
+     * @param string $type
+     *
+     * @return Type
+     */
+    public function type($type = null)
+    {
+        return new Type($type);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Query.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Query.php
new file mode 100755
index 0000000..3489821
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Query.php
@@ -0,0 +1,591 @@
+<?php
+
+namespace Elastica\QueryBuilder\DSL;
+
+use Elastica\Exception\DeprecatedException;
+use Elastica\Exception\NotImplementedException;
+use Elastica\Filter\AbstractFilter;
+use Elastica\Query\AbstractQuery;
+use Elastica\Query\BoolQuery;
+use Elastica\Query\Boosting;
+use Elastica\Query\Common;
+use Elastica\Query\ConstantScore;
+use Elastica\Query\DisMax;
+use Elastica\Query\Filtered;
+use Elastica\Query\FunctionScore;
+use Elastica\Query\Fuzzy;
+use Elastica\Query\HasChild;
+use Elastica\Query\HasParent;
+use Elastica\Query\Ids;
+use Elastica\Query\Match;
+use Elastica\Query\MatchAll;
+use Elastica\Query\MoreLikeThis;
+use Elastica\Query\MultiMatch;
+use Elastica\Query\Nested;
+use Elastica\Query\Prefix;
+use Elastica\Query\QueryString;
+use Elastica\Query\Range;
+use Elastica\Query\Regexp;
+use Elastica\Query\SimpleQueryString;
+use Elastica\Query\Term;
+use Elastica\Query\Terms;
+use Elastica\Query\TopChildren;
+use Elastica\Query\Wildcard;
+use Elastica\QueryBuilder\DSL;
+
+/**
+ * elasticsearch query DSL.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-queries.html
+ */
+class Query implements DSL
+{
+    /**
+     * must return type for QueryBuilder usage.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return self::TYPE_QUERY;
+    }
+
+    /**
+     * match query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html
+     *
+     * @param string $field
+     * @param mixed  $values
+     *
+     * @return Match
+     */
+    public function match($field = null, $values = null)
+    {
+        return new Match($field, $values);
+    }
+
+    /**
+     * multi match query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-multi-match-query.html
+     *
+     * @return \Elastica\Query\MultiMatch
+     */
+    public function multi_match()
+    {
+        return new MultiMatch();
+    }
+
+    /**
+     * bool query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-query.html
+     *
+     * @return \Elastica\Query\BoolQuery
+     */
+    public function bool()
+    {
+        return new BoolQuery();
+    }
+
+    /**
+     * boosting query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-boosting-query.html
+     *
+     * @return Boosting
+     */
+    public function boosting()
+    {
+        return new Boosting();
+    }
+
+    /**
+     * common terms query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-common-terms-query.html
+     *
+     * @param string $field
+     * @param string $query
+     * @param float  $cutoffFrequency percentage in decimal form (.001 == 0.1%)
+     *
+     * @return Common
+     */
+    public function common_terms($field, $query, $cutoffFrequency)
+    {
+        return new Common($field, $query, $cutoffFrequency);
+    }
+
+    /**
+     * custom filters score query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/0.90/query-dsl-custom-filters-score-query.html
+     */
+    public function custom_filters_score()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * custom score query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/0.90/query-dsl-custom-score-query.html
+     */
+    public function custom_score()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * custom boost factor query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/0.90/query-dsl-custom-boost-factor-query.html
+     */
+    public function custom_boost_factor()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * constant score query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-constant-score-query.html
+     *
+     * @param null|\Elastica\Filter\AbstractFilter|array $filter
+     *
+     * @return ConstantScore
+     */
+    public function constant_score($filter = null)
+    {
+        return new ConstantScore($filter);
+    }
+
+    /**
+     * dis max query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-dis-max-query.html
+     *
+     * @return DisMax
+     */
+    public function dis_max()
+    {
+        return new DisMax();
+    }
+
+    /**
+     * field query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/0.90/query-dsl-field-query.html
+     */
+    public function field()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * filtered query.
+     *
+     * @deprecated Use bool() instead. Filtered query is deprecated since ES 2.0.0-beta1 and this method will be removed in further Elastica releases.
+     *
+     * @param AbstractFilter $filter
+     * @param AbstractQuery  $query
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-filtered-query.html
+     *
+     * @return Filtered
+     */
+    public function filtered(AbstractQuery $query = null, $filter = null)
+    {
+        trigger_error('Use bool() instead. Filtered query is deprecated since ES 2.0.0-beta1 and this method will be removed in further Elastica releases.', E_USER_DEPRECATED);
+
+        return new Filtered($query, $filter);
+    }
+
+    /**
+     * fuzzy like this query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-flt-query.html
+     *
+     * @return FuzzyLikeThis
+     */
+    public function fuzzy_like_this()
+    {
+        throw new NotImplementedException('Removed in elasticsearch 2.0');
+    }
+
+    /**
+     * fuzzy like this field query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-flt-field-query.html
+     */
+    public function fuzzy_like_this_field()
+    {
+        throw new NotImplementedException('Removed in elasticsearch 2.0');
+    }
+
+    /**
+     * function score query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-function-score-query.html
+     *
+     * @return FunctionScore
+     */
+    public function function_score()
+    {
+        return new FunctionScore();
+    }
+
+    /**
+     * fuzzy query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-fuzzy-query.html
+     *
+     * @param string $fieldName Field name
+     * @param string $value     String to search for
+     *
+     * @return Fuzzy
+     */
+    public function fuzzy($fieldName = null, $value = null)
+    {
+        return new Fuzzy($fieldName, $value);
+    }
+
+    /**
+     * geo shape query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html
+     */
+    public function geo_shape()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * has child query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-child-query.html
+     *
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
+     * @param string                                               $type  Parent document type
+     *
+     * @return HasChild
+     */
+    public function has_child($query, $type = null)
+    {
+        return new HasChild($query, $type);
+    }
+
+    /**
+     * has parent query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-parent-query.html
+     *
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
+     * @param string                                               $type  Parent document type
+     *
+     * @return HasParent
+     */
+    public function has_parent($query, $type)
+    {
+        return new HasParent($query, $type);
+    }
+
+    /**
+     * ids query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html
+     *
+     * @param array|string|\Elastica\Type $type
+     * @param array                       $ids
+     *
+     * @return Ids
+     */
+    public function ids($type = null, array $ids = array())
+    {
+        return new Ids($type, $ids);
+    }
+
+    /**
+     * indices query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-indices-query.html
+     */
+    public function indices()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * match all query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-all-query.html
+     *
+     * @return MatchAll
+     */
+    public function match_all()
+    {
+        return new MatchAll();
+    }
+
+    /**
+     * more like this query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-mlt-query.html
+     *
+     * @return MoreLikeThis
+     */
+    public function more_like_this()
+    {
+        return new MoreLikeThis();
+    }
+
+    /**
+     * more_like_this_field query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/1.4/query-dsl-mlt-field-query.html
+     * @deprecated More Like This Field query is deprecated as of ES 1.4 and will be removed in ES 2.0. Use MoreLikeThis query instead. This method will be removed in further Elastica releases
+     */
+    public function more_like_this_field()
+    {
+        throw new DeprecatedException('More Like This Field query is deprecated as of ES 1.4 and will be removed in ES 2.0. Use MoreLikeThis query instead. This method will be removed in further Elastica releases');
+    }
+
+    /**
+     * nested query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-nested-query.html
+     *
+     * @return Nested
+     */
+    public function nested()
+    {
+        return new Nested();
+    }
+
+    /**
+     * prefix query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-prefix-query.html
+     *
+     * @param array $prefix Prefix array
+     *
+     * @return Prefix
+     */
+    public function prefix(array $prefix = array())
+    {
+        return new Prefix($prefix);
+    }
+
+    /**
+     * query string query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html
+     *
+     * @param string $queryString OPTIONAL Query string for object
+     *
+     * @return QueryString
+     */
+    public function query_string($queryString = '')
+    {
+        return new QueryString($queryString);
+    }
+
+    /**
+     * simple_query_string query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-simple-query-string-query.html
+     *
+     * @param string $query
+     * @param array  $fields
+     *
+     * @return SimpleQueryString
+     */
+    public function simple_query_string($query, array $fields = array())
+    {
+        return new SimpleQueryString($query, $fields);
+    }
+
+    /**
+     * range query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-query.html
+     *
+     * @param string $fieldName
+     * @param array  $args
+     *
+     * @return Range
+     */
+    public function range($fieldName = null, array $args = array())
+    {
+        return new Range($fieldName, $args);
+    }
+
+    /**
+     * regexp query.
+     *
+     * @param string $key
+     * @param string $value
+     * @param float  $boost
+     *
+     * @return Regexp
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html
+     */
+    public function regexp($key = '', $value = null, $boost = 1.0)
+    {
+        return new Regexp($key, $value, $boost);
+    }
+
+    /**
+     * span first query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-span-first-query.html
+     */
+    public function span_first()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * span multi term query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-span-multi-term-query.html
+     */
+    public function span_multi_term()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * span near query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-span-near-query.html
+     */
+    public function span_near()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * span not query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-span-not-query.html
+     */
+    public function span_not()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * span or query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-span-or-query.html
+     */
+    public function span_or()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * span term query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-span-term-query.html
+     */
+    public function span_term()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * term query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-query.html
+     *
+     * @param array $term
+     *
+     * @return Term
+     */
+    public function term(array $term = array())
+    {
+        return new Term($term);
+    }
+
+    /**
+     * terms query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-query.html
+     *
+     * @param string $key
+     * @param array  $terms
+     *
+     * @return Terms
+     */
+    public function terms($key = '', array $terms = array())
+    {
+        return new Terms($key, $terms);
+    }
+
+    /**
+     * top children query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-top-children-query.html
+     *
+     * @param string|AbstractQuery|\Elastica\Query $query
+     * @param string                               $type
+     *
+     * @return TopChildren
+     */
+    public function top_children($query, $type = null)
+    {
+        return new TopChildren($query, $type);
+    }
+
+    /**
+     * wildcard query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-wildcard-query.html
+     *
+     * @param string $key   OPTIONAL Wildcard key
+     * @param string $value OPTIONAL Wildcard value
+     * @param float  $boost OPTIONAL Boost value (default = 1)
+     *
+     * @return Wildcard
+     */
+    public function wildcard($key = '', $value = null, $boost = 1.0)
+    {
+        return new Wildcard($key, $value, $boost);
+    }
+
+    /**
+     * text query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/0.90/query-dsl-text-query.html
+     */
+    public function text()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * minimum should match query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html
+     */
+    public function minimum_should_match()
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * template query.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-template-query.html
+     */
+    public function template()
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Suggest.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Suggest.php
new file mode 100755
index 0000000..38bb402
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/DSL/Suggest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Elastica\QueryBuilder\DSL;
+
+use Elastica\Exception\NotImplementedException;
+use Elastica\QueryBuilder\DSL;
+use Elastica\Suggest\Completion;
+use Elastica\Suggest\Phrase;
+use Elastica\Suggest\Term;
+
+/**
+ * elasticsearch suggesters DSL.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters.html
+ */
+class Suggest implements DSL
+{
+    /**
+     * must return type for QueryBuilder usage.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return self::TYPE_SUGGEST;
+    }
+
+    /**
+     * term suggester.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-term.html
+     *
+     * @param $name
+     * @param $field
+     *
+     * @return Term
+     */
+    public function term($name, $field)
+    {
+        return new Term($name, $field);
+    }
+
+    /**
+     * phrase suggester.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-phrase.html
+     *
+     * @param $name
+     * @param $field
+     *
+     * @return Phrase
+     */
+    public function phrase($name, $field)
+    {
+        return new Phrase($name, $field);
+    }
+
+    /**
+     * completion suggester.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
+     *
+     * @param string $name
+     * @param string $field
+     *
+     * @return Completion
+     */
+    public function completion($name, $field)
+    {
+        return new Completion($name, $field);
+    }
+
+    /**
+     * context suggester.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/suggester-context.html
+     */
+    public function context()
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Facade.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Facade.php
new file mode 100755
index 0000000..6f18984
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Facade.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Elastica\QueryBuilder;
+
+use Elastica\Exception\QueryBuilderException;
+
+/**
+ * Facade for a specific DSL object.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ **/
+class Facade
+{
+    /**
+     * @var DSL
+     */
+    private $_dsl;
+
+    /**
+     * @var Version
+     */
+    private $_version;
+
+    /**
+     * Constructor.
+     *
+     * @param DSL     $dsl
+     * @param Version $version
+     */
+    public function __construct(DSL $dsl, Version $version)
+    {
+        $this->_dsl = $dsl;
+        $this->_version = $version;
+    }
+
+    /**
+     * Executes DSL methods.
+     *
+     * @param string $name
+     * @param array  $arguments
+     *
+     * @throws QueryBuilderException
+     *
+     * @return mixed
+     */
+    public function __call($name, array $arguments)
+    {
+        // defined check
+        if (false === method_exists($this->_dsl, $name)) {
+            throw new QueryBuilderException(
+                'undefined '.$this->_dsl->getType().' "'.$name.'"'
+            );
+        }
+
+        // version support check
+        if (false === $this->_version->supports($name, $this->_dsl->getType())) {
+            $reflection = new \ReflectionClass($this->_version);
+            throw new QueryBuilderException(
+                $this->_dsl->getType().' "'.$name.'" in '.$reflection->getShortName().' not supported'
+            );
+        }
+
+        return call_user_func_array(array($this->_dsl, $name), $arguments);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version.php
new file mode 100755
index 0000000..1dcf401
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Elastica\QueryBuilder;
+
+/**
+ * Abstract Version class.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+abstract class Version
+{
+    /**
+     * supported query methods.
+     *
+     * @var string[]
+     */
+    protected $queries = array();
+
+    /**
+     * supported filter methods.
+     *
+     * @var string[]
+     */
+    protected $filters = array();
+
+    /**
+     * supported aggregation methods.
+     *
+     * @var string[]
+     */
+    protected $aggregations = array();
+
+    /**
+     * supported $suggester methods.
+     *
+     * @var string[]
+     */
+    protected $suggesters = array();
+
+    /**
+     * returns true if $name is supported, false otherwise.
+     *
+     * @param string $name
+     * @param $type
+     *
+     * @return bool
+     */
+    public function supports($name, $type)
+    {
+        switch ($type) {
+            case DSL::TYPE_QUERY:
+                $supports = in_array($name, $this->queries);
+                break;
+            case DSL::TYPE_FILTER:
+                $supports = in_array($name, $this->filters);
+                break;
+            case DSL::TYPE_AGGREGATION:
+                $supports = in_array($name, $this->aggregations);
+                break;
+            case DSL::TYPE_SUGGEST:
+                $supports = in_array($name, $this->suggesters);
+                break;
+            default:
+                // disables version check in Facade for custom DSL objects
+                $supports = true;
+        }
+
+        return $supports;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getAggregations()
+    {
+        return $this->aggregations;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getFilters()
+    {
+        return $this->filters;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getQueries()
+    {
+        return $this->queries;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getSuggesters()
+    {
+        return $this->suggesters;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Latest.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Latest.php
new file mode 100755
index 0000000..c546fce
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Latest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Elastica\QueryBuilder\Version;
+
+/**
+ * Latest elasticsearch DSL.
+ *
+ * Latest refers to the version mentioned in README.md.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@gmail.com>
+ */
+class Latest extends Version140
+{
+    // this class always points to the latest valid DSL version
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version090.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version090.php
new file mode 100755
index 0000000..0335ee6
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version090.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Elastica\QueryBuilder\Version;
+
+use Elastica\QueryBuilder\Version;
+
+/**
+ * elasticsearch 0.9 DSL.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/0.90/index.html
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+class Version090 extends Version
+{
+    protected $queries = array(
+        'match',
+        'multi_match',
+        'bool',
+        'boosting',
+        'common_terms',
+        'custom_filters_score',
+        'custom_score',
+        'custom_boost_factor',
+        'constant_score',
+        'dis_max',
+        'field',
+        'filtered',
+        'fuzzy_like_this',
+        'fuzzy_like_this_field',
+        'function_score',
+        'fuzzy',
+        'geo_shape',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'match_all',
+        'more_like_this',
+        'more_like_this_field',
+        'nested',
+        'prefix',
+        'query_string',
+        'simple_query_string',
+        'range',
+        'regexp',
+        'span_first',
+        'span_multi_term',
+        'span_near',
+        'span_not',
+        'span_or',
+        'span_term',
+        'term',
+        'terms',
+        'top_children',
+        'wildcard',
+        'text',
+        'minimum_should_match',
+    );
+
+    protected $filters = array(
+        'bool_and', // original: bool
+        'bool',
+        'exists',
+        'geo_bounding_box',
+        'geo_distance',
+        'geo_distance_range',
+        'geo_polygon',
+        'geo_shape_provided', // original: geo_shape
+        'geo_shape_pre_indexed', // original: geo_shape
+        'geohash_cell',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'limit',
+        'match_all',
+        'missing',
+        'nested',
+        'bool_not', // original: not
+        'numeric_range',
+        'bool_or', // original: or
+        'prefix',
+        'query',
+        'range',
+        'regexp',
+        'script',
+        'term',
+        'terms',
+        'type',
+    );
+
+    protected $suggesters = array(
+        'term',
+        'phrase',
+        'completion',
+    );
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version100.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version100.php
new file mode 100755
index 0000000..d62c8fb
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version100.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Elastica\QueryBuilder\Version;
+
+use Elastica\QueryBuilder\Version;
+
+/**
+ * elasticsearch 1.0 DSL.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/1.x/index.html
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+class Version100 extends Version
+{
+    protected $queries = array(
+        'match',
+        'multi_match',
+        'bool',
+        'boosting',
+        'common_terms',
+        'constant_score',
+        'dis_max',
+        'filtered',
+        'fuzzy_like_this',
+        'fuzzy_like_this_field',
+        'function_score',
+        'fuzzy',
+        'geo_shape',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'match_all',
+        'more_like_this',
+        'more_like_this_field',
+        'nested',
+        'prefix',
+        'query_string',
+        'simple_query_string',
+        'range',
+        'regexp',
+        'span_first',
+        'span_multi_term',
+        'span_near',
+        'span_not',
+        'span_or',
+        'span_term',
+        'term',
+        'terms',
+        'top_children',
+        'wildcard',
+        'minimum_should_match',
+
+        // removed in 1.0.0
+        // 'text'
+        // 'field'
+        // 'custom_filters_score'
+        // 'custom_score'
+        // 'custom_boost_factor'
+    );
+
+    protected $filters = array(
+        'bool_and', // original: bool
+        'bool',
+        'exists',
+        'geo_bounding_box',
+        'geo_distance',
+        'geo_distance_range',
+        'geo_polygon',
+        'geo_shape_provided', // original: geo_shape
+        'geo_shape_pre_indexed', // original: geo_shape
+        'geohash_cell',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'limit',
+        'match_all',
+        'missing',
+        'nested',
+        'bool_not', // original: not
+        'bool_or', // original: or
+        'prefix',
+        'query',
+        'range',
+        'regexp',
+        'script',
+        'term',
+        'terms',
+        'type',
+
+        // removed in 1.0.0
+        // 'numeric_range'
+    );
+
+    protected $aggregations = array(
+        'min',
+        'max',
+        'sum',
+        'avg',
+        'stats',
+        'extended_stats',
+        'value_count',
+        'global_agg', // original: global
+        'filter',
+        'missing',
+        'nested',
+        'terms',
+        'range',
+        'date_range',
+        'ipv4_range',
+        'histogram',
+        'date_histogram',
+        'geo_distance',
+        'geohash_grid',
+    );
+
+    protected $suggesters = array(
+        'term',
+        'phrase',
+        'completion',
+    );
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version110.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version110.php
new file mode 100755
index 0000000..45ce5cd
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version110.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Elastica\QueryBuilder\Version;
+
+use Elastica\QueryBuilder\Version;
+
+/**
+ * elasticsearch 1.1 DSL.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/1.x/index.html
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+class Version110 extends Version
+{
+    protected $queries = array(
+        'match',
+        'multi_match',
+        'bool',
+        'boosting',
+        'common_terms',
+        'constant_score',
+        'dis_max',
+        'filtered',
+        'fuzzy_like_this',
+        'fuzzy_like_this_field',
+        'function_score',
+        'fuzzy',
+        'geo_shape',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'match_all',
+        'more_like_this',
+        'more_like_this_field',
+        'nested',
+        'prefix',
+        'query_string',
+        'simple_query_string',
+        'range',
+        'regexp',
+        'span_first',
+        'span_multi_term',
+        'span_near',
+        'span_not',
+        'span_or',
+        'span_term',
+        'term',
+        'terms',
+        'top_children',
+        'wildcard',
+        'minimum_should_match',
+
+        // removed in 1.0.0
+        // 'text'
+        // 'field'
+        // 'custom_filters_score'
+        // 'custom_score'
+        // 'custom_boost_factor'
+
+        // new in 1.1.0
+        'template',
+    );
+
+    protected $filters = array(
+        'bool_and', // original: bool
+        'bool',
+        'exists',
+        'geo_bounding_box',
+        'geo_distance',
+        'geo_distance_range',
+        'geo_polygon',
+        'geo_shape_provided', // original: geo_shape
+        'geo_shape_pre_indexed', // original: geo_shape
+        'geohash_cell',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'limit',
+        'match_all',
+        'missing',
+        'nested',
+        'bool_not', // original: not
+        'bool_or', // original: or
+        'prefix',
+        'query',
+        'range',
+        'regexp',
+        'script',
+        'term',
+        'terms',
+        'type',
+
+        // removed in 1.0.0
+        // 'numeric_range'
+    );
+
+    protected $aggregations = array(
+        'min',
+        'max',
+        'sum',
+        'avg',
+        'stats',
+        'extended_stats',
+        'value_count',
+        'global_agg', // original: global
+        'filter',
+        'missing',
+        'nested',
+        'terms',
+        'range',
+        'date_range',
+        'ipv4_range',
+        'histogram',
+        'date_histogram',
+        'geo_distance',
+        'geohash_grid',
+
+        // new in 1.1.0
+        'percentiles',
+        'cardinality',
+        'significant_terms',
+    );
+
+    protected $suggesters = array(
+        'term',
+        'phrase',
+        'completion',
+    );
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version120.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version120.php
new file mode 100755
index 0000000..0be7c00
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version120.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace Elastica\QueryBuilder\Version;
+
+use Elastica\QueryBuilder\Version;
+
+/**
+ * elasticsearch 1.2 DSL.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/1.x/index.html
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+class Version120 extends Version
+{
+    protected $queries = array(
+        'match',
+        'multi_match',
+        'bool',
+        'boosting',
+        'common_terms',
+        'constant_score',
+        'dis_max',
+        'filtered',
+        'fuzzy_like_this',
+        'fuzzy_like_this_field',
+        'function_score',
+        'fuzzy',
+        'geo_shape',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'match_all',
+        'more_like_this',
+        'more_like_this_field',
+        'nested',
+        'prefix',
+        'query_string',
+        'simple_query_string',
+        'range',
+        'regexp',
+        'span_first',
+        'span_multi_term',
+        'span_near',
+        'span_not',
+        'span_or',
+        'span_term',
+        'term',
+        'terms',
+        'top_children',
+        'wildcard',
+        'minimum_should_match',
+
+        // removed in 1.0.0
+        // 'text'
+        // 'field'
+        // 'custom_filters_score'
+        // 'custom_score'
+        // 'custom_boost_factor'
+
+        // new in 1.1.0
+        'template',
+    );
+
+    protected $filters = array(
+        'bool_and', // original: bool
+        'bool',
+        'exists',
+        'geo_bounding_box',
+        'geo_distance',
+        'geo_distance_range',
+        'geo_polygon',
+        'geo_shape_provided', // original: geo_shape
+        'geo_shape_pre_indexed', // original: geo_shape
+        'geohash_cell',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'limit',
+        'match_all',
+        'missing',
+        'nested',
+        'bool_not', // original: not
+        'bool_or', // original: or
+        'prefix',
+        'query',
+        'range',
+        'regexp',
+        'script',
+        'term',
+        'terms',
+        'type',
+
+        // removed in 1.0.0
+        // 'numeric_range'
+    );
+
+    protected $aggregations = array(
+        'min',
+        'max',
+        'sum',
+        'avg',
+        'stats',
+        'extended_stats',
+        'value_count',
+        'global_agg', // original: global
+        'filter',
+        'missing',
+        'nested',
+        'terms',
+        'range',
+        'date_range',
+        'ipv4_range',
+        'histogram',
+        'date_histogram',
+        'geo_distance',
+        'geohash_grid',
+
+        // new in 1.1.0
+        'percentiles',
+        'cardinality',
+        'significant_terms',
+
+        // new in 1.2.0
+        'reverse_nested',
+    );
+
+    protected $suggesters = array(
+        'term',
+        'phrase',
+        'completion',
+
+        // new in 1.2.0
+        'context',
+    );
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version130.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version130.php
new file mode 100755
index 0000000..2e6baad
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version130.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Elastica\QueryBuilder\Version;
+
+use Elastica\QueryBuilder\Version;
+
+/**
+ * elasticsearch 1.3 DSL.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/1.3/index.html
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+class Version130 extends Version
+{
+    protected $queries = array(
+        'match',
+        'multi_match',
+        'bool',
+        'boosting',
+        'common_terms',
+        'constant_score',
+        'dis_max',
+        'filtered',
+        'fuzzy_like_this',
+        'fuzzy_like_this_field',
+        'function_score',
+        'fuzzy',
+        'geo_shape',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'match_all',
+        'more_like_this',
+        'more_like_this_field',
+        'nested',
+        'prefix',
+        'query_string',
+        'simple_query_string',
+        'range',
+        'regexp',
+        'span_first',
+        'span_multi_term',
+        'span_near',
+        'span_not',
+        'span_or',
+        'span_term',
+        'term',
+        'terms',
+        'top_children',
+        'wildcard',
+        'minimum_should_match',
+
+        // removed in 1.0.0
+        // 'text'
+        // 'field'
+        // 'custom_filters_score'
+        // 'custom_score'
+        // 'custom_boost_factor'
+
+        // new in 1.1.0
+        'template',
+    );
+
+    protected $filters = array(
+        'bool_and', // original: bool
+        'bool',
+        'exists',
+        'geo_bounding_box',
+        'geo_distance',
+        'geo_distance_range',
+        'geo_polygon',
+        'geo_shape_provided', // original: geo_shape
+        'geo_shape_pre_indexed', // original: geo_shape
+        'geohash_cell',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'limit',
+        'match_all',
+        'missing',
+        'nested',
+        'bool_not', // original: not
+        'bool_or', // original: or
+        'prefix',
+        'query',
+        'range',
+        'regexp',
+        'script',
+        'term',
+        'terms',
+        'type',
+
+        // removed in 1.0.0
+        // 'numeric_range'
+    );
+
+    protected $aggregations = array(
+        'min',
+        'max',
+        'sum',
+        'avg',
+        'stats',
+        'extended_stats',
+        'value_count',
+        'global_agg', // original: global
+        'filter',
+        'missing',
+        'nested',
+        'terms',
+        'range',
+        'date_range',
+        'ipv4_range',
+        'histogram',
+        'date_histogram',
+        'geo_distance',
+        'geohash_grid',
+
+        // new in 1.1.0
+        'percentiles',
+        'cardinality',
+        'significant_terms',
+
+        // new in 1.2.0
+        'reverse_nested',
+
+        // new in 1.3.0
+        'percentile_ranks',
+        'geo_bounds',
+        'top_hits',
+    );
+
+    protected $suggesters = array(
+        'term',
+        'phrase',
+        'completion',
+
+        // new in 1.2.0
+        'context',
+    );
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version140.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version140.php
new file mode 100755
index 0000000..1e6515b
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version140.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace Elastica\QueryBuilder\Version;
+
+/**
+ * elasticsearch 1.4 DSL.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/1.4/index.html
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@googlemail.com>
+ */
+class Version140 extends Version130
+{
+    protected $queries = array(
+        'match',
+        'multi_match',
+        'bool',
+        'boosting',
+        'common_terms',
+        'constant_score',
+        'dis_max',
+        'filtered',
+        'fuzzy_like_this',
+        'fuzzy_like_this_field',
+        'function_score',
+        'fuzzy',
+        'geo_shape',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'match_all',
+        'more_like_this',
+        'more_like_this_field',
+        'nested',
+        'prefix',
+        'query_string',
+        'simple_query_string',
+        'range',
+        'regexp',
+        'span_first',
+        'span_multi_term',
+        'span_near',
+        'span_not',
+        'span_or',
+        'span_term',
+        'term',
+        'terms',
+        'top_children',
+        'wildcard',
+        'minimum_should_match',
+
+        // removed in 1.0.0
+        // 'text'
+        // 'field'
+        // 'custom_filters_score'
+        // 'custom_score'
+        // 'custom_boost_factor'
+
+        // new in 1.1.0
+        'template',
+    );
+
+    protected $filters = array(
+        'bool_and', // original: bool
+        'bool',
+        'exists',
+        'geo_bounding_box',
+        'geo_distance',
+        'geo_distance_range',
+        'geo_polygon',
+        'geo_shape_provided', // original: geo_shape
+        'geo_shape_pre_indexed', // original: geo_shape
+        'geohash_cell',
+        'has_child',
+        'has_parent',
+        'ids',
+        'indices',
+        'limit',
+        'match_all',
+        'missing',
+        'nested',
+        'bool_not', // original: not
+        'bool_or', // original: or
+        'prefix',
+        'query',
+        'range',
+        'regexp',
+        'script',
+        'term',
+        'terms',
+        'type',
+
+        // removed in 1.0.0
+        // 'numeric_range'
+    );
+
+    protected $aggregations = array(
+        'min',
+        'max',
+        'sum',
+        'avg',
+        'stats',
+        'extended_stats',
+        'value_count',
+        'global_agg', // original: global
+        'filter',
+        'missing',
+        'nested',
+        'terms',
+        'range',
+        'date_range',
+        'ipv4_range',
+        'histogram',
+        'date_histogram',
+        'geo_distance',
+        'geohash_grid',
+
+        // new in 1.1.0
+        'percentiles',
+        'cardinality',
+        'significant_terms',
+
+        // new in 1.2.0
+        'reverse_nested',
+
+        // new in 1.3.0
+        'percentile_ranks',
+        'geo_bounds',
+        'top_hits',
+
+        // new in 1.4.0
+        'scripted_metric',
+        'filters',
+        'children',
+    );
+
+    protected $suggesters = array(
+        'term',
+        'phrase',
+        'completion',
+
+        // new in 1.2.0
+        'context',
+    );
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version150.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version150.php
new file mode 100755
index 0000000..28b7844
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/QueryBuilder/Version/Version150.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Elastica\QueryBuilder\Version;
+
+/**
+ * elasticsearch 1.5 DSL.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/1.5/index.html
+ *
+ * @author Igor Denisenko <im.denisenko@yahoo.com>
+ *
+ * @deprecated deprecated in favor of Elastica\QueryBuilder\Version\Latest
+ */
+class Version150 extends Version140
+{
+    // nothing was added nor removed
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Request.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Request.php
index 36dda6e..35a974a 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Request.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Request.php
@@ -1,13 +1,12 @@
 <?php
 
 namespace Elastica;
+
 use Elastica\Exception\InvalidException;
 
 /**
- * Elastica Request object
+ * Elastica Request object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class Request extends Param
@@ -24,13 +23,14 @@ class Request extends Param
     protected $_connection;
 
     /**
-     * Construct
+     * Construct.
      *
-     * @param string              $path       Request path
-     * @param string              $method     OPTIONAL Request method (use const's) (default = self::GET)
-     * @param array               $data       OPTIONAL Data array
-     * @param array               $query      OPTIONAL Query params
+     * @param string     $path       Request path
+     * @param string     $method     OPTIONAL Request method (use const's) (default = self::GET)
+     * @param array      $data       OPTIONAL Data array
+     * @param array      $query      OPTIONAL Query params
      * @param Connection $connection
+     *
      * @return \Elastica\Request OPTIONAL Connection object
      */
     public function __construct($path, $method = self::GET, $data = array(), array $query = array(), Connection $connection = null)
@@ -46,10 +46,11 @@ public function __construct($path, $method = self::GET, $data = array(), array $
     }
 
     /**
-     * Sets the request method. Use one of the for consts
+     * Sets the request method. Use one of the for consts.
+     *
+     * @param string $method Request method
      *
-     * @param  string           $method Request method
-     * @return \Elastica\Request Current object
+     * @return $this
      */
     public function setMethod($method)
     {
@@ -57,7 +58,7 @@ public function setMethod($method)
     }
 
     /**
-     * Get request method
+     * Get request method.
      *
      * @return string Request method
      */
@@ -67,10 +68,11 @@ public function getMethod()
     }
 
     /**
-     * Sets the request data
+     * Sets the request data.
      *
-     * @param  array            $data Request data
-     * @return \Elastica\Request
+     * @param array $data Request data
+     *
+     * @return $this
      */
     public function setData($data)
     {
@@ -78,7 +80,7 @@ public function setData($data)
     }
 
     /**
-     * Return request data
+     * Return request data.
      *
      * @return array Request data
      */
@@ -88,10 +90,11 @@ public function getData()
     }
 
     /**
-     * Sets the request path
+     * Sets the request path.
+     *
+     * @param string $path Request path
      *
-     * @param  string           $path Request path
-     * @return \Elastica\Request Current object
+     * @return $this
      */
     public function setPath($path)
     {
@@ -99,7 +102,7 @@ public function setPath($path)
     }
 
     /**
-     * Return request path
+     * Return request path.
      *
      * @return string Request path
      */
@@ -109,7 +112,7 @@ public function getPath()
     }
 
     /**
-     * Return query params
+     * Return query params.
      *
      * @return array Query params
      */
@@ -119,8 +122,9 @@ public function getQuery()
     }
 
     /**
-     * @param  array            $query
-     * @return \Elastica\Request
+     * @param array $query
+     *
+     * @return $this
      */
     public function setQuery(array $query = array())
     {
@@ -128,8 +132,9 @@ public function setQuery(array $query = array())
     }
 
     /**
-     * @param  \Elastica\Connection $connection
-     * @return \Elastica\Request
+     * @param \Elastica\Connection $connection
+     *
+     * @return $this
      */
     public function setConnection(Connection $connection)
     {
@@ -139,9 +144,10 @@ public function setConnection(Connection $connection)
     }
 
     /**
-     * Return Connection Object
+     * Return Connection Object.
+     *
+     * @throws Exception\InvalidException If no valid connection was setted
      *
-     * @throws Exception\InvalidException
      * @return \Elastica\Connection
      */
     public function getConnection()
@@ -154,7 +160,7 @@ public function getConnection()
     }
 
     /**
-     * Sends request to server
+     * Sends request to server.
      *
      * @return \Elastica\Response Response object
      */
@@ -175,17 +181,18 @@ public function toArray()
         if ($this->_connection) {
             $data['connection'] = $this->_connection->getParams();
         }
+
         return $data;
     }
 
     /**
-     * Converts request to curl request format
+     * Converts request to curl request format.
      *
      * @return string
      */
     public function toString()
     {
-        return json_encode($this->toArray());
+        return JSON::stringify($this->toArray());
     }
 
     /**
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Rescore/AbstractRescore.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Rescore/AbstractRescore.php
new file mode 100755
index 0000000..979c93d
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Rescore/AbstractRescore.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Elastica\Rescore;
+
+use Elastica\Param;
+
+/**
+ * Abstract rescore object. Should be extended by all rescorers.
+ *
+ * @author Jason Hu <mjhu91@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-rescore.html
+ */
+abstract class AbstractRescore extends Param
+{
+    /**
+     * Overridden to return rescore as name.
+     *
+     * @return string name
+     */
+    protected function _getBaseName()
+    {
+        return 'rescore';
+    }
+
+    /**
+     * Sets window_size.
+     *
+     * @param int $size
+     *
+     * @return $this
+     */
+    public function setWindowSize($size)
+    {
+        return $this->setParam('window_size', $size);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Rescore/Query.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Rescore/Query.php
new file mode 100755
index 0000000..92ab85d
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Rescore/Query.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Elastica\Rescore;
+
+use Elastica\Query as BaseQuery;
+
+/**
+ * Query Rescore.
+ *
+ * @author Jason Hu <mjhu91@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-rescore.html
+ */
+class Query extends AbstractRescore
+{
+    /**
+     * Constructor.
+     *
+     * @param string|\Elastica\Query\AbstractQuery $query
+     */
+    public function __construct($query = null)
+    {
+        $this->setParam('query', array());
+        $this->setRescoreQuery($query);
+    }
+
+    /**
+     * Override default implementation so params are in the format
+     * expected by elasticsearch.
+     *
+     * @return array Rescore array
+     */
+    public function toArray()
+    {
+        $data = $this->getParams();
+
+        if (!empty($this->_rawParams)) {
+            $data = array_merge($data, $this->_rawParams);
+        }
+
+        $array = $this->_convertArrayable($data);
+
+        if (isset($array['query']['rescore_query']['query'])) {
+            $array['query']['rescore_query'] = $array['query']['rescore_query']['query'];
+        }
+
+        return $array;
+    }
+
+    /**
+     * Sets rescoreQuery object.
+     *
+     * @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $rescoreQuery
+     *
+     * @return $this
+     */
+    public function setRescoreQuery($rescoreQuery)
+    {
+        $rescoreQuery = BaseQuery::create($rescoreQuery);
+
+        $query = $this->getParam('query');
+        $query['rescore_query'] = $rescoreQuery;
+
+        return $this->setParam('query', $query);
+    }
+
+    /**
+     * Sets query_weight.
+     *
+     * @param float $weight
+     *
+     * @return $this
+     */
+    public function setQueryWeight($weight)
+    {
+        $query = $this->getParam('query');
+        $query['query_weight'] = $weight;
+
+        return $this->setParam('query', $query);
+    }
+
+    /**
+     * Sets rescore_query_weight.
+     *
+     * @param float $weight
+     *
+     * @return $this
+     */
+    public function setRescoreQueryWeight($weight)
+    {
+        $query = $this->getParam('query');
+        $query['rescore_query_weight'] = $weight;
+
+        return $this->setParam('query', $query);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Response.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Response.php
index f603621..3f29a8e 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Response.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Response.php
@@ -1,87 +1,145 @@
 <?php
 
 namespace Elastica;
+
+use Elastica\Exception\JSONParseException;
 use Elastica\Exception\NotFoundException;
 
 /**
- * Elastica Response object
+ * Elastica Response object.
  *
  * Stores query time, and result array -> is given to result set, returned by ...
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class Response
 {
     /**
-     * Query time
+     * Query time.
      *
      * @var float Query time
      */
     protected $_queryTime = null;
 
     /**
-     * Response string (json)
+     * Response string (json).
      *
      * @var string Response
      */
     protected $_responseString = '';
 
     /**
-     * Error
+     * Error.
      *
-     * @var boolean Error
+     * @var bool Error
      */
     protected $_error = false;
 
     /**
-     * Transfer info
+     * Transfer info.
      *
      * @var array transfer info
      */
     protected $_transferInfo = array();
 
     /**
-     * Response
+     * Response.
      *
      * @var \Elastica\Response Response object
      */
     protected $_response = null;
 
     /**
-     * Construct
+     * HTTP response status code.
+     *
+     * @var int
+     */
+    protected $_status = null;
+
+    /**
+     * Whether or not to convert bigint results to string (see issue #717).
+     *
+     * @var bool
+     */
+    protected $_jsonBigintConversion = false;
+
+    /**
+     * Construct.
      *
      * @param string|array $responseString Response string (json)
+     * @param int          $responseStatus http status code
      */
-    public function __construct($responseString)
+    public function __construct($responseString, $responseStatus = null)
     {
         if (is_array($responseString)) {
             $this->_response = $responseString;
         } else {
             $this->_responseString = $responseString;
         }
+        $this->_status = $responseStatus;
     }
 
     /**
-     * Error message
+     * Error message.
      *
      * @return string Error message
      */
     public function getError()
     {
-        $message = '';
+        $error = $this->getFullError();
+
+        if (!$error) {
+            return '';
+        }
+
+        if (is_string($error)) {
+            return $error;
+        }
+
+        if (isset($error['root_cause'][0])) {
+            $error = $error['root_cause'][0];
+        }
+
+        $message = $error['reason'];
+        if (isset($error['index'])) {
+            $message .= ' [index: '.$error['index'].']';
+        }
+
+        return $message;
+    }
+
+    /**
+     * A keyed array representing any errors that occured.
+     *
+     * In case of http://localhost:9200/_alias/test the error is a string
+     *
+     * @return array|string Error data
+     */
+    public function getFullError()
+    {
         $response = $this->getData();
 
         if (isset($response['error'])) {
-            $message = $response['error'];
+            return $response['error'];
         }
+    }
 
-        return $message;
+    /**
+     * @return string Error string based on the error object
+     */
+    public function getErrorMessage()
+    {
+        $error = $this->getError();
+
+        if (!is_string($error)) {
+            $error = json_encode($error);
+        }
+
+        return $error;
     }
 
     /**
-     * True if response has error
+     * True if response has error.
      *
      * @return bool True if response has error
      */
@@ -97,7 +155,23 @@ public function hasError()
     }
 
     /**
-     * Checks if the query returned ok
+     * True if response has failed shards.
+     *
+     * @return bool True if response has failed shards
+     */
+    public function hasFailedShards()
+    {
+        try {
+            $shardsStatistics = $this->getShardsStatistics();
+        } catch (NotFoundException $e) {
+            return false;
+        }
+
+        return array_key_exists('failures', $shardsStatistics);
+    }
+
+    /**
+     * Checks if the query returned ok.
      *
      * @return bool True if ok
      */
@@ -106,21 +180,48 @@ public function isOk()
         $data = $this->getData();
 
         // Bulk insert checks. Check every item
+        if (isset($data['status'])) {
+            if ($data['status'] >= 200 && $data['status'] <= 300) {
+                return true;
+            }
+
+            return false;
+        }
+
         if (isset($data['items'])) {
+            if (isset($data['errors']) && true === $data['errors']) {
+                return false;
+            }
+
             foreach ($data['items'] as $item) {
-                if (false == $item['index']['ok']) {
+                if (isset($item['index']['ok']) && false == $item['index']['ok']) {
+                    return false;
+                } elseif (isset($item['index']['status']) && ($item['index']['status'] < 200 || $item['index']['status'] >= 300)) {
                     return false;
-                 }
+                }
             }
 
             return true;
         }
 
-        return (isset($data['ok']) && $data['ok']);
+        if ($this->_status >= 200 && $this->_status <= 300) {
+            // http status is ok
+            return true;
+        }
+
+        return isset($data['ok']) && $data['ok'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus()
+    {
+        return $this->_status;
     }
 
     /**
-     * Response data array
+     * Response data array.
      *
      * @return array Response data array
      */
@@ -131,11 +232,14 @@ public function getData()
             if ($response === false) {
                 $this->_error = true;
             } else {
-
-                $tempResponse = json_decode($response, true);
-                // If error is returned, json_decode makes empty string of string
-                if (!empty($tempResponse)) {
-                    $response = $tempResponse;
+                try {
+                    if ($this->getJsonBigintConversion()) {
+                        $response = JSON::parse($response, true, 512, JSON_BIGINT_AS_STRING);
+                    } else {
+                        $response = JSON::parse($response);
+                    }
+                } catch (JSONParseException $e) {
+                    // leave response as is if parse fails
                 }
             }
 
@@ -167,17 +271,19 @@ public function getTransferInfo()
      * Sets the transfer info of the curl request. This function is called
      * from the \Elastica\Client::_callService .
      *
-     * @param  array             $transferInfo The curl transfer information.
-     * @return \Elastica\Response Current object
+     * @param array $transferInfo The curl transfer information.
+     *
+     * @return $this
      */
     public function setTransferInfo(array $transferInfo)
     {
         $this->_transferInfo = $transferInfo;
+
         return $this;
     }
 
     /**
-     * This is only available if DEBUG constant is set to true
+     * Returns query execution time.
      *
      * @return float Query time
      */
@@ -187,10 +293,11 @@ public function getQueryTime()
     }
 
     /**
-     * Sets the query time
+     * Sets the query time.
      *
-     * @param  float             $queryTime Query time
-     * @return \Elastica\Response Current object
+     * @param float $queryTime Query time
+     *
+     * @return $this
      */
     public function setQueryTime($queryTime)
     {
@@ -200,26 +307,28 @@ public function setQueryTime($queryTime)
     }
 
     /**
-     * Time request took
+     * Time request took.
      *
      * @throws \Elastica\Exception\NotFoundException
-     * @return int                                  Time request took
+     *
+     * @return int Time request took
      */
     public function getEngineTime()
     {
         $data = $this->getData();
 
         if (!isset($data['took'])) {
-            throw new NotFoundException("Unable to find the field [took]from the response");
+            throw new NotFoundException('Unable to find the field [took]from the response');
         }
 
         return $data['took'];
     }
 
     /**
-     * Get the _shard statistics for the response
+     * Get the _shard statistics for the response.
      *
      * @throws \Elastica\Exception\NotFoundException
+     *
      * @return array
      */
     public function getShardsStatistics()
@@ -227,16 +336,17 @@ public function getShardsStatistics()
         $data = $this->getData();
 
         if (!isset($data['_shards'])) {
-            throw new NotFoundException("Unable to find the field [_shards] from the response");
+            throw new NotFoundException('Unable to find the field [_shards] from the response');
         }
 
         return $data['_shards'];
     }
 
     /**
-     * Get the _scroll value for the response
+     * Get the _scroll value for the response.
      *
      * @throws \Elastica\Exception\NotFoundException
+     *
      * @return string
      */
     public function getScrollId()
@@ -244,9 +354,29 @@ public function getScrollId()
         $data = $this->getData();
 
         if (!isset($data['_scroll_id'])) {
-            throw new NotFoundException("Unable to find the field [_scroll_id] from the response");
+            throw new NotFoundException('Unable to find the field [_scroll_id] from the response');
         }
 
         return $data['_scroll_id'];
     }
+
+    /**
+     * Sets whether or not to apply bigint conversion on the JSON result.
+     *
+     * @param bool $jsonBigintConversion
+     */
+    public function setJsonBigintConversion($jsonBigintConversion)
+    {
+        $this->_jsonBigintConversion = $jsonBigintConversion;
+    }
+
+    /**
+     * Gets whether or not to apply bigint conversion on the JSON result.
+     *
+     * @return bool
+     */
+    public function getJsonBigintConversion()
+    {
+        return $this->_jsonBigintConversion;
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Result.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Result.php
index fe87613..74236d4 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Result.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Result.php
@@ -3,25 +3,23 @@
 namespace Elastica;
 
 /**
- * Elastica result item
+ * Elastica result item.
  *
  * Stores all information from a result
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class Result
 {
     /**
-     * Hit array
+     * Hit array.
      *
      * @var array Hit array
      */
     protected $_hit = array();
 
     /**
-     * Constructs a single results object
+     * Constructs a single results object.
      *
      * @param array $hit Hit data
      */
@@ -31,14 +29,15 @@ public function __construct(array $hit)
     }
 
     /**
-     * Returns a param from the result hit array
+     * Returns a param from the result hit array.
      *
      * This function can be used to retrieve all data for which a specific
      * function doesn't exist.
      * If the param does not exist, an empty array is returned
      *
-     * @param  string $name Param name
-     * @return array  Result data
+     * @param string $name Param name
+     *
+     * @return array Result data
      */
     public function getParam($name)
     {
@@ -50,7 +49,19 @@ public function getParam($name)
     }
 
     /**
-     * Returns the hit id
+     * Test if a param from the result hit is set.
+     *
+     * @param string $name Param name to test
+     *
+     * @return bool True if the param is set, false otherwise
+     */
+    public function hasParam($name)
+    {
+        return isset($this->_hit[$name]);
+    }
+
+    /**
+     * Returns the hit id.
      *
      * @return string Hit id
      */
@@ -60,7 +71,7 @@ public function getId()
     }
 
     /**
-     * Returns the type of the result
+     * Returns the type of the result.
      *
      * @return string Result type
      */
@@ -70,7 +81,7 @@ public function getType()
     }
 
     /**
-     * Returns list of fields
+     * Returns list of fields.
      *
      * @return array Fields list
      */
@@ -80,7 +91,17 @@ public function getFields()
     }
 
     /**
-     * Returns the index name of the result
+     * Returns whether result has fields.
+     *
+     * @return bool
+     */
+    public function hasFields()
+    {
+        return $this->hasParam('fields');
+    }
+
+    /**
+     * Returns the index name of the result.
      *
      * @return string Index name
      */
@@ -90,7 +111,7 @@ public function getIndex()
     }
 
     /**
-     * Returns the score of the result
+     * Returns the score of the result.
      *
      * @return float Result score
      */
@@ -100,7 +121,7 @@ public function getScore()
     }
 
     /**
-     * Returns the raw hit array
+     * Returns the raw hit array.
      *
      * @return array Hit array
      */
@@ -110,7 +131,7 @@ public function getHit()
     }
 
     /**
-     * Returns the version information from the hit
+     * Returns the version information from the hit.
      *
      * @return string|int Document version
      */
@@ -120,9 +141,9 @@ public function getVersion()
     }
 
     /**
-     * Returns result data
+     * Returns result data.
      *
-     * Checks for partial result data with getFields, falls back to getSource
+     * Checks for partial result data with getFields, falls back to getSource or both
      *
      * @return array Result data array
      */
@@ -130,13 +151,15 @@ public function getData()
     {
         if (isset($this->_hit['fields']) && !isset($this->_hit['_source'])) {
             return $this->getFields();
+        } elseif (isset($this->_hit['fields']) && isset($this->_hit['_source'])) {
+            return array_merge($this->getFields(), $this->getSource());
         }
 
         return $this->getSource();
     }
 
     /**
-     * Returns the result source
+     * Returns the result source.
      *
      * @return array Source data array
      */
@@ -146,7 +169,7 @@ public function getSource()
     }
 
     /**
-     * Returns result data
+     * Returns result data.
      *
      * @return array Result data array
      */
@@ -166,12 +189,40 @@ public function getExplanation()
     }
 
     /**
-     * Magic function to directly access keys inside the result
+     * Returns Document.
+     * 
+     * @return \Elastica\Document
+     */
+    public function getDocument()
+    {
+        $doc = new \Elastica\Document();
+        $doc->setData($this->getSource());
+        $hit = $this->getHit();
+        if ($this->hasParam('_source')) {
+            unset($hit['_source']);
+        }
+        if ($this->hasParam('_explanation')) {
+            unset($hit['_explanation']);
+        }
+        if ($this->hasParam('highlight')) {
+            unset($hit['highlight']);
+        }
+        if ($this->hasParam('_score')) {
+            unset($hit['_score']);
+        }
+        $doc->setParams($hit);
+
+        return $doc;
+    }
+
+    /**
+     * Magic function to directly access keys inside the result.
      *
      * Returns null if key does not exist
      *
-     * @param  string $key Key name
-     * @return mixed  Key value
+     * @param string $key Key name
+     *
+     * @return mixed Key value
      */
     public function __get($key)
     {
@@ -179,11 +230,12 @@ public function __get($key)
 
         return array_key_exists($key, $source) ? $source[$key] : null;
     }
-    
+
     /**
-     * Magic function to support isset() calls
+     * Magic function to support isset() calls.
      *
      * @param string $key Key name
+     *
      * @return bool
      */
     public function __isset($key)
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet.php
index d468485..af4cdad 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet.php
@@ -1,204 +1,213 @@
 <?php
 
 namespace Elastica;
+
 use Elastica\Exception\InvalidException;
 
 /**
- * Elastica result set
+ * Elastica result set.
  *
  * List of all hits that are returned for a search on elasticsearch
  * Result set implements iterator
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class ResultSet implements \Iterator, \Countable, \ArrayAccess
 {
     /**
-     * Results
+     * Results.
+     *
+     * @deprecated Accessing this property in an extended class is deprecated. The method will become private in 4.0. Modify results by implementing BuilderInterface and passing a new Builder to your \Elastica\Search instances.
      *
-     * @var array Results
+     * @var Result[] Results
      */
     protected $_results = array();
 
     /**
-    * Suggests
-    *
-    * @var array Suggests
-    */
-    protected $_suggests = array();
-
-    /**
-     * Current position
+     * Current position.
+     *
+     * @deprecated Accessing this property in an extended class is deprecated. The method will become private in 4.0.
      *
      * @var int Current position
      */
     protected $_position = 0;
 
     /**
-     * Response
+     * Response.
+     *
+     * @deprecated Accessing this property in an extended class is deprecated. The method will become private in 4.0. Access the response by calling getResponse
      *
-     * @var \Elastica\Response Response object
+     * @var Response Response object
      */
-    protected $_response = null;
+    protected $_response;
 
     /**
-     * Query
+     * Query.
      *
-     * @var \Elastica\Query Query object
+     * @deprecated Accessing this property in an extended class is deprecated. The method will become private in 4.0. Access the response by calling getQuery
+     *
+     * @var Query Query object
      */
     protected $_query;
 
     /**
-     * @var int
+     * Constructs ResultSet object.
+     *
+     * @param Response $response Response object
+     * @param Query $query Query object
+     * @param Result[] $results
      */
-    protected $_took = 0;
+    public function __construct(Response $response, Query $query, $results)
+    {
+        $this->_query = $query;
+        $this->_response = $response;
+        $this->_results = $results;
+    }
 
     /**
-     * @var boolean
+     * Returns all results.
+     *
+     * @return Result[] Results
      */
-    protected $_timedOut = false;
+    public function getResults()
+    {
+        return $this->_results;
+    }
 
     /**
-     * @var int
+     * Returns all Documents.
+     *
+     * @return array Documents \Elastica\Document
      */
-    protected $_totalHits = 0;
+    public function getDocuments()
+    {
+        $documents = array();
+        foreach ($this->_results as $doc) {
+            $documents[] = $doc->getDocument();
+        }
 
-    /**
-     * @var float
-     */
-    protected $_maxScore = 0;
+        return $documents;
+    }
 
     /**
-     * Constructs ResultSet object
+     * Returns true if the response contains suggestion results; false otherwise.
      *
-     * @param \Elastica\Response $response Response object
-     * @param \Elastica\Query    $query    Query object
+     * @return bool
      */
-    public function __construct(Response $response, Query $query)
+    public function hasSuggests()
     {
-        $this->rewind();
-        $this->_init($response);
-        $this->_query = $query;
+        $data = $this->_response->getData();
+
+        return isset($data['suggest']);
     }
 
     /**
-     * Loads all data into the results object (initialisation)
+     * Return all suggests.
      *
-     * @param \Elastica\Response $response Response object
+     * @return array suggest results
      */
-    protected function _init(Response $response)
+    public function getSuggests()
     {
-        $this->_response = $response;
-        $result = $response->getData();
-        $this->_totalHits = isset($result['hits']['total']) ? $result['hits']['total'] : 0;
-        $this->_maxScore = isset($result['hits']['max_score']) ? $result['hits']['max_score'] : 0;
-        $this->_took = isset($result['took']) ? $result['took'] : 0;
-        $this->_timedOut = !empty($result['timed_out']);
-        if (isset($result['hits']['hits'])) {
-            foreach ($result['hits']['hits'] as $hit) {
-                $this->_results[] = new Result($hit);
-            }
-        }
+        $data = $this->_response->getData();
 
-        foreach($result as $key => $value) {
-            if($key != '_shards') {
-                if(isset($value[0]['options']) && count($value[0]['options'])>0) {
-                    $this->_suggests[$key] = $value[0];
-                }
-            }
-        }
+        return isset($data['suggest']) ? $data['suggest'] : array();
     }
 
     /**
-     * Returns all results
+     * Returns whether aggregations exist.
      *
-     * @return Result[] Results
+     * @return bool Aggregation existence
      */
-    public function getResults()
+    public function hasAggregations()
     {
-        return $this->_results;
-    }
+        $data = $this->_response->getData();
 
-    /**
-    * Return all suggests
-    *
-    * @return Suggest[] Suggests
-    */
-    public function getSuggests() 
-    {
-        return $this->_suggests;
+        return isset($data['aggregations']);
     }
 
     /**
-     * Returns whether facets exist
+     * Returns all aggregation results.
      *
-     * @return boolean Facet existence
+     * @return array
      */
-    public function hasFacets()
+    public function getAggregations()
     {
         $data = $this->_response->getData();
 
-        return isset($data['facets']);
+        return isset($data['aggregations']) ? $data['aggregations'] : array();
     }
 
     /**
-     * Returns all facets results
+     * Retrieve a specific aggregation from this result set.
+     *
+     * @param string $name the name of the desired aggregation
      *
-     * @return array Facet results
+     * @throws Exception\InvalidException if an aggregation by the given name cannot be found
+     *
+     * @return array
      */
-    public function getFacets()
+    public function getAggregation($name)
     {
         $data = $this->_response->getData();
 
-        return isset($data['facets']) ? $data['facets'] : array();
+        if (isset($data['aggregations']) && isset($data['aggregations'][$name])) {
+            return $data['aggregations'][$name];
+        }
+        throw new InvalidException("This result set does not contain an aggregation named {$name}.");
     }
 
     /**
-     * Returns the total number of found hits
+     * Returns the total number of found hits.
      *
      * @return int Total hits
      */
     public function getTotalHits()
     {
-        return (int) $this->_totalHits;
+        $data = $this->_response->getData();
+
+        return isset($data['hits']['total']) ? (int) $data['hits']['total'] : 0;
     }
 
     /**
-     * Returns the max score of the results found
+     * Returns the max score of the results found.
      *
      * @return float Max Score
      */
     public function getMaxScore()
     {
-        return (float) $this->_maxScore;
+        $data = $this->_response->getData();
+
+        return isset($data['hits']['max_score']) ? (float) $data['hits']['max_score'] : 0;
     }
 
     /**
-    * Returns the total number of ms for this search to complete
-    *
-    * @return int Total time
-    */
+     * Returns the total number of ms for this search to complete.
+     *
+     * @return int Total time
+     */
     public function getTotalTime()
     {
-        return (int) $this->_took;
+        $data = $this->_response->getData();
+
+        return isset($data['took']) ? $data['took'] : 0;
     }
 
     /**
-    * Returns true iff the query has timed out
-    *
-    * @return bool Timed out
-    */
+     * Returns true if the query has timed out.
+     *
+     * @return bool Timed out
+     */
     public function hasTimedOut()
     {
-        return (bool) $this->_timedOut;
+        $data = $this->_response->getData();
+
+        return !empty($data['timed_out']);
     }
 
     /**
-     * Returns response object
+     * Returns response object.
      *
-     * @return \Elastica\Response Response object
+     * @return Response Response object
      */
     public function getResponse()
     {
@@ -206,7 +215,7 @@ public function getResponse()
     }
 
     /**
-     * @return \Elastica\Query
+     * @return Query
      */
     public function getQuery()
     {
@@ -214,7 +223,7 @@ public function getQuery()
     }
 
     /**
-     * Returns size of current set
+     * Returns size of current set.
      *
      * @return int Size of set
      */
@@ -224,17 +233,17 @@ public function count()
     }
 
     /**
-     * Returns size of current suggests
+     * Returns size of current suggests.
      *
      * @return int Size of suggests
      */
     public function countSuggests()
     {
-        return sizeof($this->_suggests);
+        return sizeof($this->getSuggests());
     }
 
     /**
-     * Returns the current object of the set
+     * Returns the current object of the set.
      *
      * @return \Elastica\Result|bool Set object or false if not valid (no more entries)
      */
@@ -248,17 +257,17 @@ public function current()
     }
 
     /**
-     * Sets pointer (current) to the next item of the set
+     * Sets pointer (current) to the next item of the set.
      */
     public function next()
     {
-        $this->_position++;
+        ++$this->_position;
 
         return $this->current();
     }
 
     /**
-     * Returns the position of the current entry
+     * Returns the position of the current entry.
      *
      * @return int Current position
      */
@@ -268,7 +277,7 @@ public function key()
     }
 
     /**
-     * Check if an object exists at the current position
+     * Check if an object exists at the current position.
      *
      * @return bool True if object exists
      */
@@ -278,7 +287,7 @@ public function valid()
     }
 
     /**
-     * Resets position to 0, restarts iterator
+     * Resets position to 0, restarts iterator.
      */
     public function rewind()
     {
@@ -286,11 +295,13 @@ public function rewind()
     }
 
     /**
-     * Whether a offset exists
+     * Whether a offset exists.
+     *
      * @link http://php.net/manual/en/arrayaccess.offsetexists.php
      *
-     * @param   integer $offset
-     * @return  boolean true on success or false on failure.
+     * @param int $offset
+     *
+     * @return bool true on success or false on failure.
      */
     public function offsetExists($offset)
     {
@@ -298,48 +309,54 @@ public function offsetExists($offset)
     }
 
     /**
-     * Offset to retrieve
+     * Offset to retrieve.
+     *
      * @link http://php.net/manual/en/arrayaccess.offsetget.php
      *
-     * @param   integer $offset
-     * @throws  Exception\InvalidException
-     * @return  Result|null
+     * @param int $offset
+     *
+     * @throws Exception\InvalidException If offset doesn't exist
+     *
+     * @return Result|null
      */
     public function offsetGet($offset)
     {
         if ($this->offsetExists($offset)) {
             return $this->_results[$offset];
         } else {
-            throw new InvalidException("Offset does not exist.");
+            throw new InvalidException('Offset does not exist.');
         }
     }
 
     /**
-     * Offset to set
+     * Offset to set.
+     *
      * @link http://php.net/manual/en/arrayaccess.offsetset.php
      *
-     * @param   integer $offset
-     * @param   Result  $value
-     * @throws  Exception\InvalidException
+     * @param int    $offset
+     * @param Result $value
+     *
+     * @throws Exception\InvalidException
      */
     public function offsetSet($offset, $value)
     {
         if (!($value instanceof Result)) {
-            throw new InvalidException("ResultSet is a collection of Result only.");
+            throw new InvalidException('ResultSet is a collection of Result only.');
         }
 
         if (!isset($this->_results[$offset])) {
-            throw new InvalidException("Offset does not exist.");
+            throw new InvalidException('Offset does not exist.');
         }
 
         $this->_results[$offset] = $value;
     }
 
     /**
-     * Offset to unset
+     * Offset to unset.
+     *
      * @link http://php.net/manual/en/arrayaccess.offsetunset.php
      *
-     * @param integer $offset
+     * @param int $offset
      */
     public function offsetUnset($offset)
     {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet/Builder.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet/Builder.php
new file mode 100755
index 0000000..8d29d81
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet/Builder.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Elastica\ResultSet;
+
+use Elastica\Query;
+use Elastica\Response;
+use Elastica\Result;
+use Elastica\ResultSet;
+
+class Builder implements BuilderInterface
+{
+    /**
+     * Builds a ResultSet for a given Response.
+     *
+     * @param Response $response
+     * @param Query $query
+     * @return ResultSet
+     */
+    public function buildResultSet(Response $response, Query $query)
+    {
+        $results = $this->buildResults($response);
+        $resultSet = new ResultSet($response, $query, $results);
+
+        return $resultSet;
+    }
+
+    /**
+     * Builds individual result objects.
+     *
+     * @param Response $response
+     * @return Result[]
+     */
+    private function buildResults(Response $response)
+    {
+        $data = $response->getData();
+        $results = [];
+
+        if (!isset($data['hits']['hits'])) {
+            return $results;
+        }
+
+        foreach ($data['hits']['hits'] as $hit) {
+            $results[] = new Result($hit);
+        }
+
+        return $results;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet/BuilderInterface.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet/BuilderInterface.php
new file mode 100755
index 0000000..3dbff1f
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ResultSet/BuilderInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Elastica\ResultSet;
+
+use Elastica\Query;
+use Elastica\Response;
+use Elastica\ResultSet;
+
+interface BuilderInterface
+{
+    /**
+     * Builds a ResultSet given a specific response and query.
+     *
+     * @param Response $response
+     * @param Query $query
+     * @return ResultSet
+     */
+    public function buildResultSet(Response $response, Query $query);
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScanAndScroll.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScanAndScroll.php
new file mode 100755
index 0000000..36a8c10
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScanAndScroll.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Elastica;
+
+/**
+ * Scan and Scroll Iterator.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/guide/current/scan-scroll.html
+ */
+class ScanAndScroll extends Scroll
+{
+    /**
+     * @var int
+     */
+    public $sizePerShard;
+
+    /**
+     * Constructor.
+     *
+     * @param Search $search
+     * @param string $expiryTime
+     * @param int    $sizePerShard
+     */
+    public function __construct(Search $search, $expiryTime = '1m', $sizePerShard = 1000)
+    {
+        $this->sizePerShard = $sizePerShard;
+
+        parent::__construct($search, $expiryTime);
+    }
+
+    /**
+     * Initial scan search.
+     *
+     * @link http://php.net/manual/en/iterator.rewind.php
+     */
+    public function rewind()
+    {
+        // reset state
+        $this->_nextScrollId = null;
+        $this->_options = array(null, null, null, null);
+
+        $this->_saveOptions();
+
+        // initial scan request
+        $this->_search->getQuery()->setSize($this->sizePerShard);
+        $this->_search->setOption(Search::OPTION_SCROLL, $this->expiryTime);
+        $this->_search->setOption(Search::OPTION_SCROLL_ID, null);
+        $this->_search->setOption(Search::OPTION_SEARCH_TYPE, Search::OPTION_SEARCH_TYPE_SCAN);
+        $this->_setScrollId($this->_search->search());
+
+        $this->_revertOptions();
+
+        // first scroll request
+        $this->next();
+    }
+
+    /**
+     * Save all search options manipulated by Scroll.
+     */
+    protected function _saveOptions()
+    {
+        $query = $this->_search->getQuery();
+        if ($query->hasParam('size')) {
+            $this->_options[3] = $query->getParam('size');
+        }
+
+        parent::_saveOptions();
+    }
+
+    /**
+     * Revert search options to previously saved state.
+     */
+    protected function _revertOptions()
+    {
+        $this->_search->getQuery()->setSize($this->_options[3]);
+
+        parent::_revertOptions();
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script.php
index f896c90..ee4bdbd 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script.php
@@ -2,239 +2,13 @@
 
 namespace Elastica;
 
-use Elastica\Exception\InvalidException;
+use Elastica\Script\Script as BaseScript;
 
 /**
- * Script objects, containing script internals
+ * Kept for BC reasons.
  *
- * @category Xodoa
- * @package Elastica
- * @author avasilenko <aa.vasilenko@gmail.com>
- * @link http://www.elasticsearch.org/guide/reference/modules/scripting.html
+ * @deprecated Use \Elastica\Script\Script instead.
  */
-class Script extends Param
+class Script extends BaseScript
 {
-    const LANG_MVEL   = 'mvel';
-    const LANG_JS     = 'js';
-    const LANG_GROOVY = 'groovy';
-    const LANG_PYTHON = 'python';
-    const LANG_NATIVE = 'native';
-
-    /**
-     * @var string
-     */
-    private $_script;
-
-    /**
-     * @var string
-     */
-    private $_lang;
-
-    /**
-     * @var \Elastica\Document
-     */
-    protected $_upsert;
-
-    /**
-     * @param string      $script
-     * @param array|null  $params
-     * @param string|null $lang
-     */
-    public function __construct($script, array $params = null, $lang = null, $id = null)
-    {
-        $this->setScript($script);
-        if ($params) {
-            $this->setParams($params);
-        }
-        if ($lang) {
-            $this->setLang($lang);
-        }
-
-        if ($id) {
-            $this->setId($id);
-        }
-    }
-
-    /**
-     * @param string $lang
-     */
-    public function setLang($lang)
-    {
-        $this->_lang = $lang;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLang()
-    {
-        return $this->_lang;
-    }
-
-    /**
-     * @param string $script
-     */
-    public function setScript($script)
-    {
-        $this->_script = $script;
-    }
-
-    /**
-     * @return string
-     */
-    public function getScript()
-    {
-        return $this->_script;
-    }
-
-    /**
-     * @param  string|array|\Elastica\Script        $data
-     * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Script
-     */
-    public static function create($data)
-    {
-        if ($data instanceof self) {
-            $script = $data;
-        } elseif (is_array($data)) {
-            $script = self::_createFromArray($data);
-        } elseif (is_string($data)) {
-            $script = new self($data);
-        } else {
-            throw new InvalidException('Failed to create script. Invalid data passed.');
-        }
-
-        return $script;
-    }
-
-    /**
-     * @param \Elastica\Document|array $data
-     * @return \Elastica\Document
-     */
-    public function setUpsert($data)
-    {
-        $document = Document::create($data);
-        $this->_upsert = $document;
-
-        return $this;
-    }
-
-    /**
-     * @return \Elastica\Document
-     */
-    public function getUpsert()
-    {
-        return $this->_upsert;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasUpsert()
-    {
-        return null !== $this->_upsert;
-    }
-
-    /**
-     * Sets the id of the document the script updates.
-     *
-     * @param  string            $id
-     * @return \Elastica\Script
-     */
-    public function setId($id)
-    {
-        return $this->setParam('_id', $id);
-    }
-
-    /**
-     * Returns id of the document the script updates.
-     *
-     * @return string|int Document id
-     */
-    public function getId()
-    {
-        return ($this->hasParam('_id')) ? $this->getParam('_id') : null;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasId()
-    {
-        return (bool)$this->getId();
-    }
-
-    /**
-     * @param array $fields if empty array all options will be returned, field names can be either with underscored either without, i.e. _percolate, routing
-     * @param bool $withUnderscore should option keys contain underscore prefix
-     * @return array
-     */
-    public function getOptions(array $fields = array(), $withUnderscore = false)
-    {
-        if (!empty($fields)) {
-            $data = array();
-            
-            foreach ($fields as $field) {
-                $key = '_' . ltrim($field, '_');
-                if ($this->hasParam($key) && '' !== (string) $this->getParam($key)) {
-                    $data[$key] = $this->getParam($key);
-                }
-            }
-            
-        } else {
-            $data = $this->getParams();
-        }
-        
-        if (!$withUnderscore) {
-            foreach ($data as $key => $value) {
-                $data[ltrim($key, '_')] = $value;
-                unset($data[$key]);
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * @param  array                               $data
-     * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Script
-     */
-    protected static function _createFromArray(array $data)
-    {
-        if (!isset($data['script'])) {
-            throw new InvalidException("\$data['script'] is required");
-        }
-
-        $script = new self($data['script']);
-
-        if (isset($data['lang'])) {
-            $script->setLang($data['lang']);
-        }
-        if (isset($data['params'])) {
-            if (!is_array($data['params'])) {
-                throw new InvalidException("\$data['params'] should be array");
-            }
-            $script->setParams($data['params']);
-        }
-
-        return $script;
-    }
-
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        $array = array(
-            'script' => $this->_script,
-        );
-        if (!empty($this->_params)) {
-            $array['params'] = $this->_params;
-        }
-        if ($this->_lang) {
-            $array['lang'] = $this->_lang;
-        }
-
-        return $array;
-    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/AbstractScript.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/AbstractScript.php
new file mode 100755
index 0000000..da639b9
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/AbstractScript.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Elastica\Script;
+
+use Elastica\AbstractUpdateAction;
+
+/**
+ * Base class for Script object.
+ *
+ * @author Nicolas Assing <nicolas.assing@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html
+ */
+abstract class AbstractScript extends AbstractUpdateAction
+{
+    /**
+     * @param array|null $params
+     * @param string     $id
+     */
+    public function __construct(array $params = null, $id = null)
+    {
+        if ($params) {
+            $this->setParams($params);
+        }
+
+        if ($id) {
+            $this->setId($id);
+        }
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/Script.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/Script.php
new file mode 100755
index 0000000..e2aeb99
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/Script.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace Elastica\Script;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Script objects, containing script internals.
+ *
+ * @author avasilenko <aa.vasilenko@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html
+ */
+class Script extends AbstractScript
+{
+    const LANG_MVEL = 'mvel';
+    const LANG_JS = 'js';
+    const LANG_GROOVY = 'groovy';
+    const LANG_PYTHON = 'python';
+    const LANG_NATIVE = 'native';
+
+    /**
+     * @var string
+     */
+    private $_script;
+
+    /**
+     * @var string
+     */
+    private $_lang;
+
+    /**
+     * @param string      $script
+     * @param array|null  $params
+     * @param string|null $lang
+     * @param null        $id
+     */
+    public function __construct($script, array $params = null, $lang = null, $id = null)
+    {
+        parent::__construct($params, $id);
+
+        $this->setScript($script);
+
+        if ($lang) {
+            $this->setLang($lang);
+        }
+    }
+
+    /**
+     * @param string $lang
+     *
+     * @return $this
+     */
+    public function setLang($lang)
+    {
+        $this->_lang = $lang;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLang()
+    {
+        return $this->_lang;
+    }
+
+    /**
+     * @param string $script
+     *
+     * @return $this
+     */
+    public function setScript($script)
+    {
+        $this->_script = $script;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getScript()
+    {
+        return $this->_script;
+    }
+
+    /**
+     * @param string|array|\Elastica\Script $data
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return self
+     */
+    public static function create($data)
+    {
+        if ($data instanceof self) {
+            $script = $data;
+        } elseif (is_array($data)) {
+            $script = self::_createFromArray($data);
+        } elseif (is_string($data)) {
+            $script = new self($data);
+        } else {
+            throw new InvalidException('Failed to create script. Invalid data passed.');
+        }
+
+        return $script;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return self
+     */
+    protected static function _createFromArray(array $data)
+    {
+        if (!isset($data['script'])) {
+            throw new InvalidException("\$data['script'] is required");
+        }
+
+        $script = new self($data['script']);
+
+        if (isset($data['lang'])) {
+            $script->setLang($data['lang']);
+        }
+
+        if (isset($data['params'])) {
+            if (!is_array($data['params'])) {
+                throw new InvalidException("\$data['params'] should be array");
+            }
+            $script->setParams($data['params']);
+        }
+
+        return $script;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = array(
+            'script' => $this->_script,
+        );
+
+        if (!empty($this->_params)) {
+            $array['params'] = $this->_convertArrayable($this->_params);
+        }
+
+        if ($this->_lang) {
+            $array['lang'] = $this->_lang;
+        }
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/ScriptFields.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/ScriptFields.php
new file mode 100755
index 0000000..f60f325
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/ScriptFields.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Elastica\Script;
+
+use Elastica\Exception\InvalidException;
+use Elastica\Param;
+
+/**
+ * Container for scripts as fields.
+ *
+ * @author Sebastien Lavoie <github@lavoie.sl>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-script-fields.html
+ */
+class ScriptFields extends Param
+{
+    /**
+     * @param \Elastica\Script\Script[]|array $scripts OPTIONAL
+     */
+    public function __construct(array $scripts = array())
+    {
+        if ($scripts) {
+            $this->setScripts($scripts);
+        }
+    }
+
+    /**
+     * @param string                          $name   Name of the Script field
+     * @param \Elastica\Script\AbstractScript $script
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
+     */
+    public function addScript($name, AbstractScript $script)
+    {
+        if (!is_string($name) || !strlen($name)) {
+            throw new InvalidException('The name of a Script is required and must be a string');
+        }
+        $this->setParam($name, $script);
+
+        return $this;
+    }
+
+    /**
+     * @param \Elastica\Script\Script[]|array $scripts Associative array of string => Elastica\Script\Script
+     *
+     * @return $this
+     */
+    public function setScripts(array $scripts)
+    {
+        $this->_params = array();
+        foreach ($scripts as $name => $script) {
+            $this->addScript($name, $script);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->_convertArrayable($this->_params);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/ScriptFile.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/ScriptFile.php
new file mode 100755
index 0000000..eecd951
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Script/ScriptFile.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Elastica\Script;
+
+use Elastica\Exception\InvalidException;
+
+/**
+ * Script objects, containing script internals.
+ *
+ * @author avasilenko <aa.vasilenko@gmail.com>
+ * @author Nicolas Assing <nicolas.assing@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html
+ */
+class ScriptFile extends Script
+{
+    /**
+     * @var string
+     */
+    private $_scriptFile;
+
+    /**
+     * @param string     $scriptFile
+     * @param array|null $params
+     * @param null       $id
+     */
+    public function __construct($scriptFile, array $params = null, $id = null)
+    {
+        parent::__construct(null, $params, null, $id);
+
+        $this->setScriptFile($scriptFile);
+    }
+
+    /**
+     * @param string $scriptFile
+     *
+     * @return $this
+     */
+    public function setScriptFile($scriptFile)
+    {
+        $this->_scriptFile = $scriptFile;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getScriptFile()
+    {
+        return $this->_scriptFile;
+    }
+
+    /**
+     * @param string|array|\Elastica\ScriptFile $data
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return self
+     */
+    public static function create($data)
+    {
+        if ($data instanceof self) {
+            $scriptFile = $data;
+        } elseif (is_array($data)) {
+            $scriptFile = self::_createFromArray($data);
+        } elseif (is_string($data)) {
+            $scriptFile = new self($data);
+        } else {
+            throw new InvalidException('Failed to create scriptFile. Invalid data passed.');
+        }
+
+        return $scriptFile;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @throws \Elastica\Exception\InvalidException
+     *
+     * @return self
+     */
+    protected static function _createFromArray(array $data)
+    {
+        if (!isset($data['script_file'])) {
+            throw new InvalidException("\$data['script_file'] is required");
+        }
+
+        $scriptFile = new self($data['script_file']);
+
+        if (isset($data['params'])) {
+            if (!is_array($data['params'])) {
+                throw new InvalidException("\$data['params'] should be array");
+            }
+            $scriptFile->setParams($data['params']);
+        }
+
+        return $scriptFile;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = array(
+            'script_file' => $this->_scriptFile,
+        );
+
+        if (!empty($this->_params)) {
+            $array['params'] = $this->_params;
+        }
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScriptFields.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScriptFields.php
index 0a8b487..0ce748d 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScriptFields.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScriptFields.php
@@ -1,63 +1,14 @@
 <?php
 
 namespace Elastica;
-use Elastica\Exception\InvalidException;
+
+use Elastica\Script\ScriptFields as BaseScriptFields;
 
 /**
- * Container for scripts as fields
+ * Kept for BC reasons.
  *
- * @category Xodoa
- * @package Elastica
- * @author Sebastien Lavoie <github@lavoie.sl>
- * @link http://www.elasticsearch.org/guide/reference/api/search/script-fields.html
+ * @deprecated Use \Elastica\Script\ScriptFields instead.
  */
-class ScriptFields extends Param
+class ScriptFields extends BaseScriptFields
 {
-    /**
-     * @param \Elastica\Script[]|array $scripts OPTIONAL
-     */
-    public function __construct(array $scripts = array())
-    {
-        if ($scripts) {
-            $this->setScripts($scripts);
-        }
-    }
-
-    /**
-     * @param  string                              $name   Name of the Script field
-     * @param  \Elastica\Script                     $script
-     * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\ScriptFields
-     */
-    public function addScript($name, Script $script)
-    {
-        if (!is_string($name) || !strlen($name)) {
-            throw new InvalidException('The name of a Script is required and must be a string');
-        }
-        $this->setParam($name, $script->toArray());
-
-        return $this;
-    }
-
-    /**
-     * @param  \Elastica\Script[]|array $scripts Associative array of string => Elastica\Script
-     * @return \Elastica\ScriptFields
-     */
-    public function setScripts(array $scripts)
-    {
-        $this->_params = array();
-        foreach ($scripts as $name => $script) {
-            $this->addScript($name, $script);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        return $this->_params;
-    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScriptFile.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScriptFile.php
new file mode 100755
index 0000000..731f84c
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/ScriptFile.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Elastica;
+
+use Elastica\Script\ScriptFile as BaseScriptFile;
+
+/**
+ * Kept for BC reasons.
+ *
+ * @deprecated Use \Elastica\Script\ScriptFile instead.
+ */
+class ScriptFile extends BaseScriptFile
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Scroll.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Scroll.php
new file mode 100755
index 0000000..d9c2490
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Scroll.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace Elastica;
+
+/**
+ * Scroll Iterator.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@gmail.com>
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-scroll.html
+ */
+class Scroll implements \Iterator
+{
+    /**
+     * @var string
+     */
+    public $expiryTime;
+
+    /**
+     * @var Search
+     */
+    protected $_search;
+
+    /**
+     * @var null|string
+     */
+    protected $_nextScrollId = null;
+
+    /**
+     * @var null|ResultSet
+     */
+    protected $_currentResultSet = null;
+
+    /**
+     * 0: scroll<br>
+     * 1: scroll id<br>
+     * 2: search type.
+     *
+     * @var array
+     */
+    protected $_options = array(null, null, null);
+
+    /**
+     * Constructor.
+     *
+     * @param Search $search
+     * @param string $expiryTime
+     */
+    public function __construct(Search $search, $expiryTime = '1m')
+    {
+        $this->_search = $search;
+        $this->expiryTime = $expiryTime;
+    }
+
+    /**
+     * Returns current result set.
+     *
+     * @link http://php.net/manual/en/iterator.current.php
+     *
+     * @return ResultSet
+     */
+    public function current()
+    {
+        return $this->_currentResultSet;
+    }
+
+    /**
+     * Next scroll search.
+     *
+     * @link http://php.net/manual/en/iterator.next.php
+     */
+    public function next()
+    {
+        $this->_saveOptions();
+
+        $this->_search->setOption(Search::OPTION_SCROLL, $this->expiryTime);
+        $this->_search->setOption(Search::OPTION_SCROLL_ID, $this->_nextScrollId);
+        $this->_search->setOption(Search::OPTION_SEARCH_TYPE, Search::OPTION_SEARCH_TYPE_SCROLL);
+        $this->_setScrollId($this->_search->search());
+
+        $this->_revertOptions();
+    }
+
+    /**
+     * Returns scroll id.
+     *
+     * @link http://php.net/manual/en/iterator.key.php
+     *
+     * @return string
+     */
+    public function key()
+    {
+        return $this->_nextScrollId;
+    }
+
+    /**
+     * Returns true if current result set contains at least one hit.
+     *
+     * @link http://php.net/manual/en/iterator.valid.php
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        return
+            $this->_nextScrollId !== null
+            && $this->_currentResultSet !== null
+            && $this->_currentResultSet->count() > 0;
+    }
+
+    /**
+     * Initial scroll search.
+     *
+     * @link http://php.net/manual/en/iterator.rewind.php
+     */
+    public function rewind()
+    {
+        // reset state
+        $this->_nextScrollId = null;
+        $this->_options = array(null, null, null);
+
+        // initial search
+        $this->_saveOptions();
+
+        $this->_search->setOption(Search::OPTION_SCROLL, $this->expiryTime);
+        $this->_search->setOption(Search::OPTION_SCROLL_ID, null);
+        $this->_search->setOption(Search::OPTION_SEARCH_TYPE, null);
+        $this->_setScrollId($this->_search->search());
+
+        $this->_revertOptions();
+    }
+
+    /**
+     * Prepares Scroll for next request.
+     *
+     * @param ResultSet $resultSet
+     */
+    protected function _setScrollId(ResultSet $resultSet)
+    {
+        $this->_currentResultSet = $resultSet;
+
+        $this->_nextScrollId = null;
+        if ($resultSet->getResponse()->isOk()) {
+            $this->_nextScrollId = $resultSet->getResponse()->getScrollId();
+        }
+    }
+
+    /**
+     * Save all search options manipulated by Scroll.
+     */
+    protected function _saveOptions()
+    {
+        if ($this->_search->hasOption(Search::OPTION_SCROLL)) {
+            $this->_options[0] = $this->_search->getOption(Search::OPTION_SCROLL);
+        }
+
+        if ($this->_search->hasOption(Search::OPTION_SCROLL_ID)) {
+            $this->_options[1] = $this->_search->getOption(Search::OPTION_SCROLL_ID);
+        }
+
+        if ($this->_search->hasOption(Search::OPTION_SEARCH_TYPE)) {
+            $this->_options[2] = $this->_search->getOption(Search::OPTION_SEARCH_TYPE);
+        }
+    }
+
+    /**
+     * Revert search options to previously saved state.
+     */
+    protected function _revertOptions()
+    {
+        $this->_search->setOption(Search::OPTION_SCROLL, $this->_options[0]);
+        $this->_search->setOption(Search::OPTION_SCROLL_ID, $this->_options[1]);
+        $this->_search->setOption(Search::OPTION_SEARCH_TYPE, $this->_options[2]);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Search.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Search.php
index 2c60f5f..112099e 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Search.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Search.php
@@ -3,12 +3,13 @@
 namespace Elastica;
 
 use Elastica\Exception\InvalidException;
+use Elastica\Filter\AbstractFilter;
+use Elastica\ResultSet\Builder;
+use Elastica\ResultSet\BuilderInterface;
 
 /**
- * Elastica search object
+ * Elastica search object.
  *
- * @category Xodoa
- * @package  Elastica
  * @author   Nicolas Ruflin <spam@ruflin.com>
  */
 class Search
@@ -25,6 +26,7 @@ class Search
     const OPTION_SIZE = 'size';
     const OPTION_SCROLL = 'scroll';
     const OPTION_SCROLL_ID = 'scroll_id';
+    const OPTION_QUERY_CACHE = 'query_cache';
 
     /*
      * Search types
@@ -36,16 +38,23 @@ class Search
     const OPTION_SEARCH_TYPE_QUERY_THEN_FETCH = 'query_then_fetch';
     const OPTION_SEARCH_TYPE_QUERY_AND_FETCH = 'query_and_fetch';
     const OPTION_SEARCH_TYPE_SUGGEST = 'suggest';
+    const OPTION_SEARCH_TYPE_SCROLL = 'scroll';
+    const OPTION_SEARCH_IGNORE_UNAVAILABLE = 'ignore_unavailable';
 
     /**
-     * Array of indices
+     * @var BuilderInterface
+     */
+    private $_builder;
+
+    /**
+     * Array of indices.
      *
      * @var array
      */
     protected $_indices = array();
 
     /**
-     * Array of types
+     * Array of types.
      *
      * @var array
      */
@@ -62,28 +71,32 @@ class Search
     protected $_options = array();
 
     /**
-     * Client object
+     * Client object.
      *
      * @var \Elastica\Client
      */
     protected $_client;
 
     /**
-     * Constructs search object
+     * Constructs search object.
      *
      * @param \Elastica\Client $client Client object
+     * @param BuilderInterface $builder
      */
-    public function __construct(Client $client)
+    public function __construct(Client $client, BuilderInterface $builder = null)
     {
+        $this->_builder = $builder ?: new Builder();
         $this->_client = $client;
     }
 
     /**
-     * Adds a index to the list
+     * Adds a index to the list.
+     *
+     * @param \Elastica\Index|string $index Index object or string
      *
-     * @param  \Elastica\Index|string               $index Index object or string
      * @throws \Elastica\Exception\InvalidException
-     * @return \Elastica\Search                     Current object
+     *
+     * @return $this
      */
     public function addIndex($index)
     {
@@ -91,20 +104,21 @@ public function addIndex($index)
             $index = $index->getName();
         }
 
-        if (!is_string($index)) {
+        if (!is_scalar($index)) {
             throw new InvalidException('Invalid param type');
         }
 
-        $this->_indices[] = $index;
+        $this->_indices[] = (string) $index;
 
         return $this;
     }
 
     /**
-     * Add array of indices at once
+     * Add array of indices at once.
+     *
+     * @param array $indices
      *
-     * @param  array           $indices
-     * @return \Elastica\Search
+     * @return $this
      */
     public function addIndices(array $indices = array())
     {
@@ -116,11 +130,13 @@ public function addIndices(array $indices = array())
     }
 
     /**
-     * Adds a type to the current search
+     * Adds a type to the current search.
+     *
+     * @param \Elastica\Type|string $type Type name or object
      *
-     * @param  \Elastica\Type|string                $type Type name or object
-     * @return \Elastica\Search                     Search object
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return $this
      */
     public function addType($type)
     {
@@ -138,10 +154,11 @@ public function addType($type)
     }
 
     /**
-     * Add array of types
+     * Add array of types.
      *
-     * @param  array           $types
-     * @return \Elastica\Search
+     * @param array $types
+     *
+     * @return $this
      */
     public function addTypes(array $types = array())
     {
@@ -153,20 +170,26 @@ public function addTypes(array $types = array())
     }
 
     /**
-     * @param  string|array|\Elastica\Query|Elastica\Suggest\Term|\Elastica\Query\AbstractQuery|\Elastica\Filter\AbstractFilter $query|
-     * @return \Elastica\Search
+     * @param string|array|\Elastica\Query|\Elastica\Suggest|\Elastica\Query\AbstractQuery $query
+     *
+     * @return $this
      */
     public function setQuery($query)
     {
+        if ($query instanceof AbstractFilter) {
+            trigger_error('Deprecated: Elastica\Search::setQuery() passing AbstractFilter is deprecated. Create query and use setPostFilter with AbstractQuery instead.', E_USER_DEPRECATED);
+        }
+
         $this->_query = Query::create($query);
 
         return $this;
     }
 
     /**
-     * @param  string          $key
-     * @param  mixed           $value
-     * @return \Elastica\Search
+     * @param string $key
+     * @param mixed  $value
+     *
+     * @return $this
      */
     public function setOption($key, $value)
     {
@@ -178,8 +201,9 @@ public function setOption($key, $value)
     }
 
     /**
-     * @param  array           $options
-     * @return \Elastica\Search
+     * @param array $options
+     *
+     * @return $this
      */
     public function setOptions(array $options)
     {
@@ -193,7 +217,7 @@ public function setOptions(array $options)
     }
 
     /**
-     * @return \Elastica\Search
+     * @return $this
      */
     public function clearOptions()
     {
@@ -203,9 +227,10 @@ public function clearOptions()
     }
 
     /**
-     * @param  string          $key
-     * @param  mixed           $value
-     * @return \Elastica\Search
+     * @param string $key
+     * @param mixed  $value
+     *
+     * @return $this
      */
     public function addOption($key, $value)
     {
@@ -221,7 +246,8 @@ public function addOption($key, $value)
     }
 
     /**
-     * @param  string $key
+     * @param string $key
+     *
      * @return bool
      */
     public function hasOption($key)
@@ -230,14 +256,16 @@ public function hasOption($key)
     }
 
     /**
-     * @param  string                              $key
-     * @return mixed
+     * @param string $key
+     *
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return mixed
      */
     public function getOption($key)
     {
         if (!$this->hasOption($key)) {
-            throw new InvalidException('Option ' . $key . ' does not exist');
+            throw new InvalidException('Option '.$key.' does not exist');
         }
 
         return $this->_options[$key];
@@ -252,9 +280,11 @@ public function getOptions()
     }
 
     /**
-     * @param  string                              $key
-     * @return bool
+     * @param string $key
+     *
      * @throws \Elastica\Exception\InvalidException
+     *
+     * @return bool
      */
     protected function _validateOption($key)
     {
@@ -269,14 +299,16 @@ protected function _validateOption($key)
             case self::OPTION_SCROLL:
             case self::OPTION_SCROLL_ID:
             case self::OPTION_SEARCH_TYPE_SUGGEST:
+            case self::OPTION_SEARCH_IGNORE_UNAVAILABLE:
+            case self::OPTION_QUERY_CACHE:
                 return true;
         }
 
-        throw new InvalidException('Invalid option ' . $key);
+        throw new InvalidException('Invalid option '.$key);
     }
 
     /**
-     * Return client object
+     * Return client object.
      *
      * @return \Elastica\Client Client object
      */
@@ -286,7 +318,7 @@ public function getClient()
     }
 
     /**
-     * Return array of indices
+     * Return array of indices.
      *
      * @return array List of index names
      */
@@ -305,6 +337,7 @@ public function hasIndices()
 
     /**
      * @param Index|string $index
+     *
      * @return bool
      */
     public function hasIndex($index)
@@ -317,7 +350,7 @@ public function hasIndex($index)
     }
 
     /**
-     * Return array of types
+     * Return array of types.
      *
      * @return array List of types
      */
@@ -336,6 +369,7 @@ public function hasTypes()
 
     /**
      * @param \Elastica\Type|string $type
+     *
      * @return bool
      */
     public function hasType($type)
@@ -360,10 +394,11 @@ public function getQuery()
     }
 
     /**
-     * Creates new search object
+     * Creates new search object.
      *
-     * @param  \Elastica\SearchableInterface               $searchObject
-     * @return \Elastica\Search
+     * @param \Elastica\SearchableInterface $searchObject
+     *
+     * @return Search
      */
     public static function create(SearchableInterface $searchObject)
     {
@@ -371,16 +406,16 @@ public static function create(SearchableInterface $searchObject)
     }
 
     /**
-     * Combines indices and types to the search request path
+     * Combines indices and types to the search request path.
      *
      * @return string Search path
      */
     public function getPath()
     {
-    	if (isset($this->_options[self::OPTION_SCROLL_ID])) {
-    	    return '_search/scroll';
-    	}
-    	
+        if (isset($this->_options[self::OPTION_SCROLL_ID])) {
+            return '_search/scroll';
+        }
+
         $indices = $this->getIndices();
 
         $path = '';
@@ -395,23 +430,21 @@ public function getPath()
         }
 
         if (!empty($types)) {
-            $path .= '/' . implode(',', $types);
-        }
-
-        if(isset($this->_options[self::OPTION_SEARCH_TYPE_SUGGEST])) {
-            return '/_suggest';
+            $path .= '/'.implode(',', $types);
         }
 
         // Add full path based on indices and types -> could be all
-        return $path . '/_search';
+        return $path.'/_search';
     }
 
     /**
-     * Search in the set indices, types
+     * Search in the set indices, types.
+     *
+     * @param mixed     $query
+     * @param int|array $options OPTIONAL Limit or associative array of options (option=>value)
      *
-     * @param  mixed                               $query
-     * @param  int|array                           $options OPTIONAL Limit or associative array of options (option=>value)
      * @throws \Elastica\Exception\InvalidException
+     *
      * @return \Elastica\ResultSet
      */
     public function search($query = '', $options = null)
@@ -423,20 +456,28 @@ public function search($query = '', $options = null)
 
         $params = $this->getOptions();
 
+        // Send scroll_id via raw HTTP body to handle cases of very large (> 4kb) ids.
+        if ('_search/scroll' == $path) {
+            $data = $params[self::OPTION_SCROLL_ID];
+            unset($params[self::OPTION_SCROLL_ID]);
+        } else {
+            $data = $query->toArray();
+        }
+
         $response = $this->getClient()->request(
             $path,
             Request::GET,
-            $query->toArray(),
+            $data,
             $params
         );
 
-        return new ResultSet($response, $query);
+        return $this->_builder->buildResultSet($response, $query);
     }
 
     /**
-     *
      * @param mixed $query
-	 * @param $fullResult (default = false) By default only the total hit count is returned. If set to true, the full ResultSet including facets is returned.
+     * @param $fullResult (default = false) By default only the total hit count is returned. If set to true, the full ResultSet including aggregations is returned.
+     *
      * @return int|ResultSet
      */
     public function count($query = '', $fullResult = false)
@@ -452,15 +493,16 @@ public function count($query = '', $fullResult = false)
             $query->toArray(),
             array(self::OPTION_SEARCH_TYPE => self::OPTION_SEARCH_TYPE_COUNT)
         );
-        $resultSet = new ResultSet($response, $query);
-		
-        return $fullResult?$resultSet:$resultSet->getTotalHits();
+        $resultSet = $this->_builder->buildResultSet($response, $query);
+
+        return $fullResult ? $resultSet : $resultSet->getTotalHits();
     }
 
     /**
-     * @param  array|int                   $options
-     * @param  string|array|\Elastica\Query $query
-     * @return \Elastica\Search
+     * @param array|int                    $options
+     * @param string|array|\Elastica\Query $query
+     *
+     * @return $this
      */
     public function setOptionsAndQuery($options = null, $query = '')
     {
@@ -475,7 +517,7 @@ public function setOptionsAndQuery($options = null, $query = '')
                 $this->getQuery()->setSize($options['limit']);
                 unset($options['limit']);
             }
-              if (isset($options['explain'])) {
+            if (isset($options['explain'])) {
                 $this->getQuery()->setExplain($options['explain']);
                 unset($options['explain']);
             }
@@ -486,13 +528,49 @@ public function setOptionsAndQuery($options = null, $query = '')
     }
 
     /**
-     * @param  \Elastica\Suggest\Term   $term
-     * @return \Elastica\Search
+     * @param Suggest $suggest
+     *
+     * @return $this
      */
-    public function addSuggest($suggest)
+    public function setSuggest(Suggest $suggest)
     {
-        $this->setOptionsAndQuery(array(self::OPTION_SEARCH_TYPE_SUGGEST => 'suggest'), $suggest);
-    
-        return $this;
+        return $this->setOptionsAndQuery(array(self::OPTION_SEARCH_TYPE_SUGGEST => 'suggest'), $suggest);
+    }
+
+    /**
+     * Returns the Scroll Iterator.
+     *
+     * @see Elastica\Scroll
+     *
+     * @param string $expiryTime
+     *
+     * @return Scroll
+     */
+    public function scroll($expiryTime = '1m')
+    {
+        return new Scroll($this, $expiryTime);
+    }
+
+    /**
+     * Returns the ScanAndScroll Iterator.
+     *
+     * @see Elastica\ScanAndScroll
+     *
+     * @param string $expiryTime
+     * @param int    $sizePerShard
+     *
+     * @return ScanAndScroll
+     */
+    public function scanAndScroll($expiryTime = '1m', $sizePerShard = 1000)
+    {
+        return new ScanAndScroll($this, $expiryTime, $sizePerShard);
+    }
+
+    /**
+     * @return BuilderInterface
+     */
+    public function getResultSetBuilder()
+    {
+        return $this->_builder;
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/SearchableInterface.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/SearchableInterface.php
index 372bcb1..ef1a1cd 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/SearchableInterface.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/SearchableInterface.php
@@ -3,16 +3,14 @@
 namespace Elastica;
 
 /**
- * Elastica searchable interface
+ * Elastica searchable interface.
  *
- * @category Xodoa
- * @package Elastica
  * @author Thibault Duplessis <thibault.duplessis@gmail.com>
  */
 interface SearchableInterface
 {
     /**
-     * Searches results for a query
+     * Searches results for a query.
      *
      * TODO: Improve sample code
      * {
@@ -28,24 +26,28 @@ interface SearchableInterface
      *      }
      * }
      *
-     * @param  string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
-     * @return \Elastica\ResultSet          ResultSet with all results inside
+     * @param string|array|\Elastica\Query $query   Array with all query data inside or a Elastica\Query object
+     * @param null                         $options
+     *
+     * @return \Elastica\ResultSet with all results inside
      */
     public function search($query = '', $options = null);
 
     /**
-     * Counts results for a query
+     * Counts results for a query.
      *
      * If no query is set, matchall query is created
      *
-     * @param  string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
-     * @return int                         number of documents matching the query
+     * @param string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
+     *
+     * @return int number of documents matching the query
      */
     public function count($query = '');
 
     /**
-     * @param \Elastica\Query $query
-     * @param array $options
+     * @param \Elastica\Query|string $query
+     * @param array                  $options
+     *
      * @return \Elastica\Search
      */
     public function createSearch($query = '', $options = null);
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Snapshot.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Snapshot.php
new file mode 100755
index 0000000..2e212d0
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Snapshot.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Elastica;
+
+use Elastica\Exception\NotFoundException;
+use Elastica\Exception\ResponseException;
+
+/**
+ * Class Snapshot.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-snapshots.html
+ */
+class Snapshot
+{
+    /**
+     * @var Client
+     */
+    protected $_client;
+
+    /**
+     * @param Client $client
+     */
+    public function __construct(Client $client)
+    {
+        $this->_client = $client;
+    }
+
+    /**
+     * Register a snapshot repository.
+     *
+     * @param string $name     the name of the repository
+     * @param string $type     the repository type ("fs" for file system)
+     * @param array  $settings Additional repository settings. If type "fs" is used, the "location" setting must be provided.
+     *
+     * @return Response
+     */
+    public function registerRepository($name, $type, $settings = array())
+    {
+        $data = array(
+            'type' => $type,
+            'settings' => $settings,
+        );
+
+        return $this->request($name, Request::PUT, $data);
+    }
+
+    /**
+     * Retrieve a repository record by name.
+     *
+     * @param string $name the name of the desired repository
+     *
+     * @throws Exception\ResponseException
+     * @throws Exception\NotFoundException
+     *
+     * @return array
+     */
+    public function getRepository($name)
+    {
+        try {
+            $response = $this->request($name);
+        } catch (ResponseException $e) {
+            if ($e->getResponse()->getStatus() == 404) {
+                throw new NotFoundException("Repository '".$name."' does not exist.");
+            }
+            throw $e;
+        }
+        $data = $response->getData();
+
+        return $data[$name];
+    }
+
+    /**
+     * Retrieve all repository records.
+     *
+     * @return array
+     */
+    public function getAllRepositories()
+    {
+        return $this->request('_all')->getData();
+    }
+
+    /**
+     * Create a new snapshot.
+     *
+     * @param string $repository        the name of the repository in which this snapshot should be stored
+     * @param string $name              the name of this snapshot
+     * @param array  $options           optional settings for this snapshot
+     * @param bool   $waitForCompletion if true, the request will not return until the snapshot operation is complete
+     *
+     * @return Response
+     */
+    public function createSnapshot($repository, $name, $options = array(), $waitForCompletion = false)
+    {
+        return $this->request($repository.'/'.$name, Request::PUT, $options, array('wait_for_completion' => $waitForCompletion));
+    }
+
+    /**
+     * Retrieve data regarding a specific snapshot.
+     *
+     * @param string $repository the name of the repository from which to retrieve the snapshot
+     * @param string $name       the name of the desired snapshot
+     *
+     * @throws Exception\ResponseException
+     * @throws Exception\NotFoundException
+     *
+     * @return array
+     */
+    public function getSnapshot($repository, $name)
+    {
+        try {
+            $response = $this->request($repository.'/'.$name);
+        } catch (ResponseException $e) {
+            if ($e->getResponse()->getStatus() == 404) {
+                throw new NotFoundException("Snapshot '".$name."' does not exist in repository '".$repository."'.");
+            }
+            throw $e;
+        }
+        $data = $response->getData();
+
+        return $data['snapshots'][0];
+    }
+
+    /**
+     * Retrieve data regarding all snapshots in the given repository.
+     *
+     * @param string $repository the repository name
+     *
+     * @return array
+     */
+    public function getAllSnapshots($repository)
+    {
+        return $this->request($repository.'/_all')->getData();
+    }
+
+    /**
+     * Delete a snapshot.
+     *
+     * @param string $repository the repository in which the snapshot resides
+     * @param string $name       the name of the snapshot to be deleted
+     *
+     * @return Response
+     */
+    public function deleteSnapshot($repository, $name)
+    {
+        return $this->request($repository.'/'.$name, Request::DELETE);
+    }
+
+    /**
+     * Restore a snapshot.
+     *
+     * @param string $repository        the name of the repository
+     * @param string $name              the name of the snapshot
+     * @param array  $options           options for the restore operation
+     * @param bool   $waitForCompletion if true, the request will not return until the restore operation is complete
+     *
+     * @return Response
+     */
+    public function restoreSnapshot($repository, $name, $options = array(), $waitForCompletion = false)
+    {
+        return $this->request($repository.'/'.$name.'/_restore', Request::POST, $options, array('wait_for_completion' => $waitForCompletion));
+    }
+
+    /**
+     * Perform a snapshot request.
+     *
+     * @param string $path   the URL
+     * @param string $method the HTTP method
+     * @param array  $data   request body data
+     * @param array  $query  query string parameters
+     *
+     * @return Response
+     */
+    public function request($path, $method = Request::GET, $data = array(), array $query = array())
+    {
+        return $this->_client->request('/_snapshot/'.$path, $method, $data, $query);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Status.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Status.php
index a492f56..c3e4a7c 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Status.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Status.php
@@ -1,96 +1,81 @@
 <?php
 
 namespace Elastica;
-use Elastica\Index\Status as IndexStatus;
+
+use Elastica\Exception\ResponseException;
 
 /**
- * Elastica general status
+ * Elastica general status.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/api/admin-indices-status.html
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-status.html
  */
 class Status
 {
     /**
-     * Contains all status infos
+     * Contains all status infos.
      *
      * @var \Elastica\Response Response object
      */
     protected $_response = null;
 
     /**
-     * Data
+     * Data.
      *
      * @var array Data
      */
-    protected $_data = array();
+    protected $_data = null;
 
     /**
-     * Client object
+     * Client object.
      *
      * @var \Elastica\Client Client object
      */
     protected $_client = null;
 
     /**
-     * Constructs Status object
+     * Constructs Status object.
      *
      * @param \Elastica\Client $client Client object
      */
     public function __construct(Client $client)
     {
         $this->_client = $client;
-        $this->refresh();
     }
 
     /**
-     * Returns status data
+     * Returns status data.
      *
      * @return array Status data
      */
     public function getData()
     {
-        return $this->_data;
-    }
-
-    /**
-     * Returns status objects of all indices
-     *
-     * @return array|\Elastica\Index\Status[] List of Elastica\Client\Index objects
-     */
-    public function getIndexStatuses()
-    {
-        $statuses = array();
-        foreach ($this->getIndexNames() as $name) {
-            $index = new Index($this->_client, $name);
-            $statuses[] = new IndexStatus($index);
+        if (is_null($this->_data)) {
+            $this->refresh();
         }
 
-        return $statuses;
+        return $this->_data;
     }
 
     /**
-     * Returns a list of the existing index names
+     * Returns a list of the existing index names.
      *
      * @return array Index names list
      */
     public function getIndexNames()
     {
-        $names = array();
-        foreach ($this->_data['indices'] as $name => $data) {
-            $names[] = $name;
-        }
+        $data = $this->getData();
 
-        return $names;
+        return array_keys($data['indices']);
     }
 
     /**
-     * Checks if the given index exists
+     * Checks if the given index exists.
+     *
+     * @param string $name Index name to check
      *
-     * @param  string $name Index name to check
-     * @return bool   True if index exists
+     * @return bool True if index exists
      */
     public function indexExists($name)
     {
@@ -98,78 +83,79 @@ public function indexExists($name)
     }
 
     /**
-     * Checks if the given alias exists
+     * Checks if the given alias exists.
      *
-     * @param  string $name Alias name
-     * @return bool   True if alias exists
+     * @param string $name Alias name
+     *
+     * @return bool True if alias exists
      */
     public function aliasExists($name)
     {
-        foreach ($this->getIndexStatuses() as $status) {
-            if ($status->hasAlias($name)) {
-                return true;
-            }
-        }
-
-        return false;
+        return count($this->getIndicesWithAlias($name)) > 0;
     }
 
     /**
-     * Returns an array with all indices that the given alias name points to
+     * Returns an array with all indices that the given alias name points to.
+     *
+     * @param string $alias Alias name
      *
-     * @param  string                 $name Alias name
      * @return array|\Elastica\Index[] List of Elastica\Index
      */
-    public function getIndicesWithAlias($name)
+    public function getIndicesWithAlias($alias)
     {
-        $indices = array();
-        foreach ($this->getIndexStatuses() as $status) {
-            if ($status->hasAlias($name)) {
-                $indices[] = $status->getIndex();
+        $response = null;
+        try {
+            $response = $this->_client->request('/_alias/'.$alias);
+        } catch (ResponseException $e) {
+            $transferInfo = $e->getResponse()->getTransferInfo();
+            // 404 means the index alias doesn't exist which means no indexes have it.
+            if ($transferInfo['http_code'] === 404) {
+                return array();
             }
+            // If we don't have a 404 then this is still unexpected so rethrow the exception.
+            throw $e;
+        }
+        $indices = array();
+        foreach ($response->getData() as $name => $unused) {
+            $indices[] = new Index($this->_client, $name);
         }
 
         return $indices;
     }
 
     /**
-     * Returns response object
+     * Returns response object.
      *
      * @return \Elastica\Response Response object
      */
     public function getResponse()
     {
+        if (is_null($this->_response)) {
+            $this->refresh();
+        }
+
         return $this->_response;
     }
 
     /**
-     * Return shards info
+     * Return shards info.
      *
      * @return array Shards info
      */
     public function getShards()
     {
-        return $this->_data['shards'];
+        $data = $this->getData();
+
+        return $data['shards'];
     }
 
     /**
-     * Refresh status object
+     * Refresh status object.
      */
     public function refresh()
     {
-        $path = '_status';
+        $path = '_stats';
         $this->_response = $this->_client->request($path, Request::GET);
         $this->_data = $this->getResponse()->getData();
     }
-
-    /**
-     * Refresh serverStatus object
-     */
-    public function getServerStatus()
-    {
-        $path = '';
-        $response = $this->_client->request($path, Request::GET);
-
-        return  $response->getData();
-    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest.php
new file mode 100755
index 0000000..91f15a0
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Elastica;
+
+use Elastica\Exception\NotImplementedException;
+use Elastica\Suggest\AbstractSuggest;
+
+/**
+ * Class Suggest.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters.html
+ */
+class Suggest extends Param
+{
+    /**
+     * @param AbstractSuggest $suggestion
+     */
+    public function __construct(AbstractSuggest $suggestion = null)
+    {
+        if (!is_null($suggestion)) {
+            $this->addSuggestion($suggestion);
+        }
+    }
+
+    /**
+     * Set the global text for this suggester.
+     *
+     * @param string $text
+     *
+     * @return $this
+     */
+    public function setGlobalText($text)
+    {
+        return $this->setParam('text', $text);
+    }
+
+    /**
+     * Add a suggestion to this suggest clause.
+     *
+     * @param AbstractSuggest $suggestion
+     *
+     * @return $this
+     */
+    public function addSuggestion(AbstractSuggest $suggestion)
+    {
+        return $this->addParam('suggestion', $suggestion);
+    }
+
+    /**
+     * @param Suggest|AbstractSuggest $suggestion
+     *
+     * @throws Exception\NotImplementedException
+     *
+     * @return self
+     */
+    public static function create($suggestion)
+    {
+        switch (true) {
+            case $suggestion instanceof self:
+                return $suggestion;
+            case $suggestion instanceof AbstractSuggest:
+                return new self($suggestion);
+        }
+        throw new NotImplementedException();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        $baseName = $this->_getBaseName();
+
+        if (isset($array[$baseName]['suggestion'])) {
+            $suggestion = $array[$baseName]['suggestion'];
+            unset($array[$baseName]['suggestion']);
+
+            foreach ($suggestion as $key => $value) {
+                $array[$baseName][$key] = $value;
+            }
+        }
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/AbstractSuggest.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/AbstractSuggest.php
index 3207ce3..03e49e5 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/AbstractSuggest.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/AbstractSuggest.php
@@ -1,15 +1,120 @@
 <?php
 
 namespace Elastica\Suggest;
+
+use Elastica\Exception\InvalidException;
+use Elastica\NameableInterface;
 use Elastica\Param;
 
 /**
- * Abstract suggest object. Should be extended by all suggest types.
- *
- * @category Xodoa
- * @package Elastica
- * @author Imanol Cea <imanol.cea@gmail.com>
+ * Class AbstractSuggestion.
  */
-abstract class AbstractSuggest extends Param
+abstract class AbstractSuggest extends Param implements NameableInterface
 {
+    /**
+     * @var string the name of this suggestion
+     */
+    protected $_name;
+
+    /**
+     * @var string the text for this suggestion
+     */
+    protected $_text;
+
+    /**
+     * @param string $name
+     * @param string $field
+     */
+    public function __construct($name, $field)
+    {
+        $this->setName($name);
+        $this->setField($field);
+    }
+
+    /**
+     * Suggest text must be set either globally or per suggestion.
+     *
+     * @param string $text
+     *
+     * @return $this
+     */
+    public function setText($text)
+    {
+        $this->_text = $text;
+
+        return $this;
+    }
+
+    /**
+     * @param string $field
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', $field);
+    }
+
+    /**
+     * @param int $size
+     *
+     * @return $this
+     */
+    public function setSize($size)
+    {
+        return $this->setParam('size', $size);
+    }
+
+    /**
+     * @param int $size maximum number of suggestions to be retrieved from each shard
+     *
+     * @return $this
+     */
+    public function setShardSize($size)
+    {
+        return $this->setParam('shard_size', $size);
+    }
+
+    /**
+     * Sets the name of the suggest. It is automatically set by
+     * the constructor.
+     *
+     * @param string $name The name of the suggest.
+     *
+     * @throws \Elastica\Exception\InvalidException If name is empty
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        if (empty($name)) {
+            throw new InvalidException('Suggest name has to be set');
+        }
+        $this->_name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the name of this suggestion.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+        if (isset($this->_text)) {
+            $array['text'] = $this->_text;
+        }
+
+        return $array;
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/CandidateGenerator/AbstractCandidateGenerator.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/CandidateGenerator/AbstractCandidateGenerator.php
new file mode 100755
index 0000000..eb0eeed
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/CandidateGenerator/AbstractCandidateGenerator.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Elastica\Suggest\CandidateGenerator;
+
+use Elastica\Param;
+
+class AbstractCandidateGenerator extends Param
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/CandidateGenerator/DirectGenerator.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/CandidateGenerator/DirectGenerator.php
new file mode 100755
index 0000000..676013b
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/CandidateGenerator/DirectGenerator.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace Elastica\Suggest\CandidateGenerator;
+
+/**
+ * Class DirectGenerator.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-phrase.html#_direct_generators
+ */
+class DirectGenerator extends AbstractCandidateGenerator
+{
+    const SUGGEST_MODE_MISSING = 'missing';
+    const SUGGEST_MODE_POPULAR = 'popular';
+    const SUGGEST_MODE_ALWAYS = 'always';
+
+    /**
+     * @param string $field
+     */
+    public function __construct($field)
+    {
+        $this->setField($field);
+    }
+
+    /**
+     * Set the field name from which to fetch candidate suggestions.
+     *
+     * @param string $field
+     *
+     * @return $this
+     */
+    public function setField($field)
+    {
+        return $this->setParam('field', $field);
+    }
+
+    /**
+     * Set the maximum corrections to be returned per suggest text token.
+     *
+     * @param int $size
+     *
+     * @return $this
+     */
+    public function setSize($size)
+    {
+        return $this->setParam('size', $size);
+    }
+
+    /**
+     * @param string $mode see SUGGEST_MODE_* constants for options
+     *
+     * @return $this
+     */
+    public function setSuggestMode($mode)
+    {
+        return $this->setParam('suggest_mode', $mode);
+    }
+
+    /**
+     * @param int $max can only be a value between 1 and 2. Defaults to 2.
+     *
+     * @return $this
+     */
+    public function setMaxEdits($max)
+    {
+        return $this->setParam('max_edits', $max);
+    }
+
+    /**
+     * @param int $length defaults to 1
+     *
+     * @return $this
+     */
+    public function setPrefixLength($length)
+    {
+        return $this->setParam('prefix_len', $length);
+    }
+
+    /**
+     * @param int $min defaults to 4
+     *
+     * @return $this
+     */
+    public function setMinWordLength($min)
+    {
+        return $this->setParam('min_word_len', $min);
+    }
+
+    /**
+     * @param int $max
+     *
+     * @return $this
+     */
+    public function setMaxInspections($max)
+    {
+        return $this->setParam('max_inspections', $max);
+    }
+
+    /**
+     * @param float $min
+     *
+     * @return $this
+     */
+    public function setMinDocFrequency($min)
+    {
+        return $this->setParam('min_doc_freq', $min);
+    }
+
+    /**
+     * @param float $max
+     *
+     * @return $this
+     */
+    public function setMaxTermFrequency($max)
+    {
+        return $this->setParam('max_term_freq', $max);
+    }
+
+    /**
+     * Set an analyzer to be applied to the original token prior to candidate generation.
+     *
+     * @param string $pre an analyzer
+     *
+     * @return $this
+     */
+    public function setPreFilter($pre)
+    {
+        return $this->setParam('pre_filter', $pre);
+    }
+
+    /**
+     * Set an analyzer to be applied to generated tokens before they are passed to the phrase scorer.
+     *
+     * @param string $post
+     *
+     * @return $this
+     */
+    public function setPostFilter($post)
+    {
+        return $this->setParam('post_filter', $post);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Completion.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Completion.php
new file mode 100755
index 0000000..962499f
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Completion.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Elastica\Suggest;
+
+/**
+ * Completion suggester.
+ *
+ * @author Igor Denisenko <im.denisenko@yahoo.com>
+ *
+ * @link   https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
+ */
+class Completion extends AbstractSuggest
+{
+    /**
+     * Set fuzzy parameter.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-completion.html#fuzzy
+     *
+     * @param array $fuzzy
+     *
+     * @return $this
+     */
+    public function setFuzzy(array $fuzzy)
+    {
+        return $this->setParam('fuzzy', $fuzzy);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Phrase.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Phrase.php
new file mode 100755
index 0000000..fde71fc
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Phrase.php
@@ -0,0 +1,187 @@
+<?php
+
+namespace Elastica\Suggest;
+
+use Elastica\Suggest\CandidateGenerator\AbstractCandidateGenerator;
+
+/**
+ * Class Phrase.
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-phrase.html
+ */
+class Phrase extends AbstractSuggest
+{
+    /**
+     * @param string $analyzer
+     *
+     * @return $this
+     */
+    public function setAnalyzer($analyzer)
+    {
+        return $this->setParam('analyzer', $analyzer);
+    }
+
+    /**
+     * Set the max size of the n-grams (shingles) in the field.
+     *
+     * @param int $size
+     *
+     * @return $this
+     */
+    public function setGramSize($size)
+    {
+        return $this->setParam('gram_size', $size);
+    }
+
+    /**
+     * Set the likelihood of a term being misspelled even if the term exists in the dictionary.
+     *
+     * @param float $likelihood Defaults to 0.95, meaning 5% of the words are misspelled.
+     *
+     * @return $this
+     */
+    public function setRealWordErrorLikelihood($likelihood)
+    {
+        return $this->setParam('real_word_error_likelihood', $likelihood);
+    }
+
+    /**
+     * Set the factor applied to the input phrases score to be used as a threshold for other suggestion candidates.
+     * Only candidates which score higher than this threshold will be included in the result.
+     *
+     * @param float $confidence Defaults to 1.0.
+     *
+     * @return $this
+     */
+    public function setConfidence($confidence)
+    {
+        return $this->setParam('confidence', $confidence);
+    }
+
+    /**
+     * Set the maximum percentage of the terms considered to be misspellings in order to form a correction.
+     *
+     * @param float $max
+     *
+     * @return $this
+     */
+    public function setMaxErrors($max)
+    {
+        return $this->setParam('max_errors', $max);
+    }
+
+    /**
+     * @param string $separator
+     *
+     * @return $this
+     */
+    public function setSeparator($separator)
+    {
+        return $this->setParam('separator', $separator);
+    }
+
+    /**
+     * Set suggestion highlighting.
+     *
+     * @param string $preTag
+     * @param string $postTag
+     *
+     * @return $this
+     */
+    public function setHighlight($preTag, $postTag)
+    {
+        return $this->setParam('highlight', array(
+            'pre_tag' => $preTag,
+            'post_tag' => $postTag,
+        ));
+    }
+
+    /**
+     * @param float $discount
+     *
+     * @return $this
+     */
+    public function setStupidBackoffSmoothing($discount = 0.4)
+    {
+        return $this->setSmoothingModel('stupid_backoff', array(
+            'discount' => $discount,
+        ));
+    }
+
+    /**
+     * @param float $alpha
+     *
+     * @return $this
+     */
+    public function setLaplaceSmoothing($alpha = 0.5)
+    {
+        return $this->setSmoothingModel('laplace', array(
+            'alpha' => $alpha,
+        ));
+    }
+
+    /**
+     * @param float $trigramLambda
+     * @param float $bigramLambda
+     * @param float $unigramLambda
+     *
+     * @return $this
+     */
+    public function setLinearInterpolationSmoothing($trigramLambda, $bigramLambda, $unigramLambda)
+    {
+        return $this->setSmoothingModel('linear_interpolation', array(
+            'trigram_lambda' => $trigramLambda,
+            'bigram_lambda' => $bigramLambda,
+            'unigram_lambda' => $unigramLambda,
+        ));
+    }
+
+    /**
+     * @param string $model  the name of the smoothing model
+     * @param array  $params
+     *
+     * @return $this
+     */
+    public function setSmoothingModel($model, array $params)
+    {
+        return $this->setParam('smoothing', array(
+            $model => $params,
+        ));
+    }
+
+    /**
+     * @param AbstractCandidateGenerator $generator
+     *
+     * @return $this
+     */
+    public function addCandidateGenerator(AbstractCandidateGenerator $generator)
+    {
+        return $this->setParam('candidate_generator', $generator);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        $baseName = $this->_getBaseName();
+
+        if (isset($array[$baseName]['candidate_generator'])) {
+            $generator = $array[$baseName]['candidate_generator'];
+            unset($array[$baseName]['candidate_generator']);
+
+            $keys = array_keys($generator);
+            $values = array_values($generator);
+
+            if (!isset($array[$baseName][$keys[0]])) {
+                $array[$baseName][$keys[0]] = array();
+            }
+
+            $array[$baseName][$keys[0]][] = $values[0];
+        }
+
+        return $array;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Term.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Term.php
index a61799d..dc51a3a 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Term.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Suggest/Term.php
@@ -3,61 +3,128 @@
 namespace Elastica\Suggest;
 
 /**
- * Text query
+ * Class Term.
  *
- * @category Xodoa
- * @package Elastica
- * @author Imanol Cea <imanol.cea@gmail.com>
- * @link http://www.elasticsearch.org/guide/reference/api/search/term-suggest/
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-term.html
  */
 class Term extends AbstractSuggest
 {
-	 /**
-     * Global text
+    const SORT_SCORE = 'score';
+    const SORT_FREQUENCY = 'frequency';
+
+    const SUGGEST_MODE_MISSING = 'missing';
+    const SUGGEST_MODE_POPULAR = 'popular';
+    const SUGGEST_MODE_ALWAYS = 'always';
+
+    /**
+     * @param string $analyzer
      *
-     * @var string Global text
+     * @return $this
      */
-    protected $_globalText;
+    public function setAnalyzer($analyzer)
+    {
+        return $this->setParam('analyzer', $analyzer);
+    }
 
     /**
-     * Options
+     * @param string $sort see SORT_* constants for options
      *
-     * @var array parameters
+     * @return $this
      */
-    protected $_parameters = array();
-
-    public function toArray()
+    public function setSort($sort)
     {
-        return $this->_params;
+        return $this->setParam('sort', $sort);
     }
 
-    public function addTerm($name, Array $term) {
+    /**
+     * @param string $mode see SUGGEST_MODE_* constants for options
+     *
+     * @return $this
+     */
+    public function setSuggestMode($mode)
+    {
+        return $this->setParam('suggest_mode', $mode);
+    }
 
-        $this->addParam($name, $term);
+    /**
+     * If true, suggest terms will be lower cased after text analysis.
+     *
+     * @param bool $lowercase
+     *
+     * @return $this
+     */
+    public function setLowercaseTerms($lowercase = true)
+    {
+        return $this->setParam('lowercase_terms', (bool) $lowercase);
     }
 
-    public function setGlobalText($text) {
-        $this->_globalText = $text;
+    /**
+     * Set the maximum edit distance candidate suggestions can have in order to be considered as a suggestion.
+     *
+     * @param int $max Either 1 or 2. Any other value will result in an error.
+     *
+     * @return $this
+     */
+    public function setMaxEdits($max)
+    {
+        return $this->setParam('max_edits', (int) $max);
     }
 
+    /**
+     * The number of minimum prefix characters that must match in order to be a suggestion candidate.
+     *
+     * @param int $length Defaults to 1.
+     *
+     * @return $this
+     */
+    public function setPrefixLength($length)
+    {
+        return $this->setParam('prefix_len', (int) $length);
+    }
 
     /**
-     * Adds a param to the list
+     * The minimum length a suggest text term must have in order to be included.
      *
-     * This function can be used to add an array of params
+     * @param int $length Defaults to 4.
      *
-     * @param  string         $key   Param key
-     * @param  mixed          $value Value to set
-     * @return \Elastica\Param
+     * @return $this
      */
-    public function addParam($key, $value)
+    public function setMinWordLength($length)
     {
-        if (!isset($this->_params[$key])) {
-            $this->_params[$key] = array();
-        }
+        return $this->setParam('min_word_len', (int) $length);
+    }
+
+    /**
+     * @param int $max Defaults to 5.
+     *
+     * @return $this
+     */
+    public function setMaxInspections($max)
+    {
+        return $this->setParam('max_inspections', $max);
+    }
 
-        $this->_params[$key] = $value;
+    /**
+     * Set the minimum number of documents in which a suggestion should appear.
+     *
+     * @param int|float $min Defaults to 0. If the value is greater than 1, it must be a whole number.
+     *
+     * @return $this
+     */
+    public function setMinDocFrequency($min)
+    {
+        return $this->setParam('min_doc_freq', $min);
+    }
 
-        return $this;
+    /**
+     * Set the maximum number of documents in which a suggest text token can exist in order to be included.
+     *
+     * @param float $max
+     *
+     * @return $this
+     */
+    public function setMaxTermFrequency($max)
+    {
+        return $this->setParam('max_term_freq', $max);
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Tool/CrossIndex.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Tool/CrossIndex.php
new file mode 100755
index 0000000..3076962
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Tool/CrossIndex.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Elastica\Tool;
+
+use Elastica\Bulk;
+use Elastica\Index;
+use Elastica\Query\MatchAll;
+use Elastica\ScanAndScroll;
+use Elastica\Search;
+use Elastica\Type;
+
+/**
+ * Functions to move documents and types between indices.
+ *
+ * @author Manuel Andreo Garcia <andreo.garcia@gmail.com>
+ */
+class CrossIndex
+{
+    /**
+     * Type option.
+     *
+     * type: string | string[] | \Elastica\Type | \Elastica\Type[] | null
+     * default: null (means all types)
+     */
+    const OPTION_TYPE = 'type';
+
+    /**
+     * Query option.
+     *
+     * type: see \Elastica\Query::create()
+     * default: Elastica\Query\MatchAll
+     */
+    const OPTION_QUERY = 'query';
+
+    /**
+     * Expiry time option.
+     *
+     * type: string (see Elastica\ScanAndScroll)
+     * default: '1m'
+     */
+    const OPTION_EXPIRY_TIME = 'expiryTime';
+
+    /**
+     * Size per shard option.
+     *
+     * type: int (see Elastica\ScanAndScroll)
+     * default: 1000
+     */
+    const OPTION_SIZE_PER_SHARD = 'sizePerShard';
+
+    /**
+     * Reindex documents from an old index to a new index.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/guide/master/reindex.html
+     *
+     * @param \Elastica\Index $oldIndex
+     * @param \Elastica\Index $newIndex
+     * @param array           $options  keys: CrossIndex::OPTION_* constants
+     *
+     * @return \Elastica\Index The new index object
+     */
+    public static function reindex(
+        Index $oldIndex,
+        Index $newIndex,
+        array $options = array()
+    ) {
+        // prepare search
+        $search = $oldIndex->createSearch();
+
+        $options = array_merge(
+            array(
+                self::OPTION_TYPE => null,
+                self::OPTION_QUERY => new MatchAll(),
+                self::OPTION_EXPIRY_TIME => '1m',
+                self::OPTION_SIZE_PER_SHARD => 1000,
+            ),
+            $options
+        );
+
+        if (isset($options[self::OPTION_TYPE])) {
+            $type = $options[self::OPTION_TYPE];
+            $search->addTypes(is_array($type) ? $type : array($type));
+        }
+        $search->setQuery($options[self::OPTION_QUERY]);
+
+        // search on old index and bulk insert in new index
+        $scanAndScroll = new ScanAndScroll(
+            $search,
+            $options[self::OPTION_EXPIRY_TIME],
+            $options[self::OPTION_SIZE_PER_SHARD]
+        );
+        foreach ($scanAndScroll as $resultSet) {
+            $bulk = new Bulk($newIndex->getClient());
+            $bulk->setIndex($newIndex);
+
+            foreach ($resultSet as $result) {
+                $action = new Bulk\Action();
+                $action->setType($result->getType());
+                $action->setId($result->getId());
+                $action->setSource($result->getData());
+
+                $bulk->addAction($action);
+            }
+
+            $bulk->send();
+        }
+
+        $newIndex->refresh();
+
+        return $newIndex;
+    }
+
+    /**
+     * Copies type mappings and documents from an old index to a new index.
+     *
+     * @see \Elastica\Tool\CrossIndex::reindex()
+     *
+     * @param \Elastica\Index $oldIndex
+     * @param \Elastica\Index $newIndex
+     * @param array           $options  keys: CrossIndex::OPTION_* constants
+     *
+     * @return \Elastica\Index The new index object
+     */
+    public static function copy(
+        Index $oldIndex,
+        Index $newIndex,
+        array $options = array()
+    ) {
+        // normalize types to array of string
+        $types = array();
+        if (isset($options[self::OPTION_TYPE])) {
+            $types = $options[self::OPTION_TYPE];
+            $types = is_array($types) ? $types : array($types);
+
+            $types = array_map(
+                function ($type) {
+                    if ($type instanceof Type) {
+                        $type = $type->getName();
+                    }
+
+                    return (string) $type;
+                },
+                $types
+            );
+        }
+
+        // copy mapping
+        foreach ($oldIndex->getMapping() as $type => $mapping) {
+            if (!empty($types) && !in_array($type, $types, true)) {
+                continue;
+            }
+
+            $type = new Type($newIndex, $type);
+            $type->setMapping($mapping['properties']);
+        }
+
+        // copy documents
+        return self::reindex($oldIndex, $newIndex, $options);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/AbstractTransport.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/AbstractTransport.php
index d2ce0fb..88b6319 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/AbstractTransport.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/AbstractTransport.php
@@ -3,15 +3,13 @@
 namespace Elastica\Transport;
 
 use Elastica\Connection;
-use Elastica\Request;
 use Elastica\Exception\InvalidException;
 use Elastica\Param;
+use Elastica\Request;
 
 /**
- * Elastica Abstract Transport object
+ * Elastica Abstract Transport object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 abstract class AbstractTransport extends Param
@@ -22,7 +20,7 @@ abstract class AbstractTransport extends Param
     protected $_connection;
 
     /**
-     * Construct transport
+     * Construct transport.
      *
      * @param \Elastica\Connection $connection Connection object
      */
@@ -43,35 +41,42 @@ public function getConnection()
 
     /**
      * @param \Elastica\Connection $connection Connection object
+     *
+     * @return $this
      */
     public function setConnection(Connection $connection)
     {
         $this->_connection = $connection;
+
+        return $this;
     }
 
     /**
-     * Executes the transport request
+     * Executes the transport request.
+     *
+     * @param \Elastica\Request $request Request object
+     * @param array             $params  Hostname, port, path, ...
      *
-     * @param  \Elastica\Request  $request Request object
-     * @param  array             $params  Hostname, port, path, ...
      * @return \Elastica\Response Response object
      */
     abstract public function exec(Request $request, array $params);
 
     /**
-     * Create a transport
+     * Create a transport.
      *
      * The $transport parameter can be one of the following values:
      *
-     * * string: The short name of a transport. For instance "Http", "Memcache" or "Thrift"
+     * * string: The short name of a transport. For instance "Http"
      * * object: An already instantiated instance of a transport
      * * array: An array with a "type" key which must be set to one of the two options. All other
      *          keys in the array will be set as parameters in the transport instance
      *
-     * @param mixed $transport A transport definition
+     * @param mixed                $transport  A transport definition
      * @param \Elastica\Connection $connection A connection instance
-     * @param array $params Parameters for the transport class
+     * @param array                $params     Parameters for the transport class
+     *
      * @throws \Elastica\Exception\InvalidException
+     *
      * @return AbstractTransport
      */
     public static function create($transport, Connection $connection, array $params = array())
@@ -85,16 +90,27 @@ public static function create($transport, Connection $connection, array $params
         }
 
         if (is_string($transport)) {
-            $className = 'Elastica\\Transport\\' . $transport;
+            $specialTransports = array(
+                'httpadapter' => 'HttpAdapter',
+                'nulltransport' => 'NullTransport',
+            );
+
+            if (isset($specialTransports[strtolower($transport)])) {
+                $transport = $specialTransports[strtolower($transport)];
+            } else {
+                $transport = ucfirst($transport);
+            }
+
+            $className = 'Elastica\\Transport\\'.$transport;
 
             if (!class_exists($className)) {
                 throw new InvalidException('Invalid transport');
             }
 
-            $transport = new $className;
+            $transport = new $className();
         }
 
-        if ($transport instanceof AbstractTransport) {
+        if ($transport instanceof self) {
             $transport->setConnection($connection);
 
             foreach ($params as $key => $value) {
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/AwsAuthV4.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/AwsAuthV4.php
new file mode 100755
index 0000000..39ee74a
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/AwsAuthV4.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Elastica\Transport;
+
+use Aws\Credentials\CredentialProvider;
+use Aws\Credentials\Credentials;
+use Aws\Signature\SignatureV4;
+use Elastica\Connection;
+use GuzzleHttp;
+use GuzzleHttp\Client;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Middleware;
+use Psr\Http\Message\RequestInterface;
+
+class AwsAuthV4 extends Guzzle
+{
+    protected function _getGuzzleClient($baseUrl, $persistent = true)
+    {
+        if (!$persistent || !self::$_guzzleClientConnection) {
+            $stack = HandlerStack::create(GuzzleHttp\choose_handler());
+            $stack->push($this->getSigningMiddleware(), 'sign');
+
+            self::$_guzzleClientConnection = new Client(array(
+                'base_uri' => $baseUrl,
+                'handler' => $stack,
+            ));
+        }
+
+        return self::$_guzzleClientConnection;
+    }
+
+    protected function _getBaseUrl(Connection $connection)
+    {
+        $this->initializePortAndScheme();
+
+        return parent::_getBaseUrl($connection);
+    }
+
+    private function getSigningMiddleware()
+    {
+        $region = $this->getConnection()->hasParam('aws_region')
+            ? $this->getConnection()->getParam('aws_region')
+            : getenv('AWS_REGION');
+        $signer = new SignatureV4('es', $region);
+        $credProvider = $this->getCredentialProvider();
+
+        return Middleware::mapRequest(function (RequestInterface $req) use (
+            $signer,
+            $credProvider
+        ) {
+            return $signer->signRequest($req, $credProvider()->wait());
+        });
+    }
+
+    private function getCredentialProvider()
+    {
+        $connection = $this->getConnection();
+        if ($connection->hasParam('aws_secret_access_key')) {
+            return CredentialProvider::fromCredentials(new Credentials(
+                $connection->getParam('aws_access_key_id'),
+                $connection->getParam('aws_secret_access_key'),
+                $connection->hasParam('aws_session_token')
+                    ? $connection->getParam('aws_session_token')
+                    : null
+            ));
+        }
+
+        return CredentialProvider::defaultProvider();
+    }
+
+    private function initializePortAndScheme()
+    {
+        $connection = $this->getConnection();
+        if (true === $this->getConfig($connection, 'ssl')) {
+            $this->_scheme = 'https';
+            $connection->setPort(443);
+        } else {
+            $this->_scheme = 'http';
+            $connection->setPort(80);
+        }
+    }
+
+    private function getConfig(Connection $conn, $key, $default = null)
+    {
+        return $conn->hasConfig($key)
+            ? $conn->getConfig($key)
+            : $default;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Guzzle.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Guzzle.php
new file mode 100755
index 0000000..8702bca
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Guzzle.php
@@ -0,0 +1,211 @@
+<?php
+
+namespace Elastica\Transport;
+
+use Elastica\Connection;
+use Elastica\Exception\Connection\GuzzleException;
+use Elastica\Exception\PartialShardFailureException;
+use Elastica\Exception\ResponseException;
+use Elastica\JSON;
+use Elastica\Request;
+use Elastica\Response;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\TransferException;
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Uri;
+
+/**
+ * Elastica Guzzle Transport object.
+ *
+ * @author Milan Magudia <milan@magudia.com>
+ */
+class Guzzle extends AbstractTransport
+{
+    /**
+     * Http scheme.
+     *
+     * @var string Http scheme
+     */
+    protected $_scheme = 'http';
+
+    /**
+     * Curl resource to reuse.
+     *
+     * @var Client Guzzle client to reuse
+     */
+    protected static $_guzzleClientConnection = null;
+
+    /**
+     * Makes calls to the elasticsearch server.
+     *
+     * All calls that are made to the server are done through this function
+     *
+     * @param \Elastica\Request $request
+     * @param array             $params  Host, Port, ...
+     *
+     * @throws \Elastica\Exception\ConnectionException
+     * @throws \Elastica\Exception\ResponseException
+     * @throws \Elastica\Exception\Connection\HttpException
+     *
+     * @return \Elastica\Response Response object
+     */
+    public function exec(Request $request, array $params)
+    {
+        $connection = $this->getConnection();
+
+        $client = $this->_getGuzzleClient($this->_getBaseUrl($connection), $connection->isPersistent());
+
+        $options = array(
+            'exceptions' => false, // 4xx and 5xx is expected and NOT an exceptions in this context
+        );
+        if ($connection->getTimeout()) {
+            $options['timeout'] = $connection->getTimeout();
+        }
+
+        $proxy = $connection->getProxy();
+
+        // See: https://github.com/facebook/hhvm/issues/4875
+        if (is_null($proxy) && defined('HHVM_VERSION')) {
+            $proxy = getenv('http_proxy') ?: null;
+        }
+
+        if (!is_null($proxy)) {
+            $options['proxy'] = $proxy;
+        }
+
+        $req = $this->_createPsr7Request($request, $connection);
+
+        try {
+            $start = microtime(true);
+            $res = $client->send($req, $options);
+            $end = microtime(true);
+        } catch (TransferException $ex) {
+            throw new GuzzleException($ex, $request, new Response($ex->getMessage()));
+        }
+
+        $response = new Response((string) $res->getBody(), $res->getStatusCode());
+        $response->setQueryTime($end - $start);
+        if ($connection->hasConfig('bigintConversion')) {
+            $response->setJsonBigintConversion($connection->getConfig('bigintConversion'));
+        }
+
+        $response->setTransferInfo(
+            array(
+                'request_header' => $request->getMethod(),
+                'http_code' => $res->getStatusCode(),
+            )
+        );
+
+        if ($response->hasError()) {
+            throw new ResponseException($request, $response);
+        }
+
+        if ($response->hasFailedShards()) {
+            throw new PartialShardFailureException($request, $response);
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param Request    $request
+     * @param Connection $connection
+     *
+     * @return Psr7\Request
+     */
+    protected function _createPsr7Request(Request $request, Connection $connection)
+    {
+        $req = new Psr7\Request(
+            $request->getMethod(),
+            $this->_getActionPath($request),
+            $connection->hasConfig('headers') && is_array($connection->getConfig('headers'))
+                ? $connection->getConfig('headers')
+                : array()
+        );
+
+        $data = $request->getData();
+        if (!empty($data) || '0' === $data) {
+            if ($req->getMethod() == Request::GET) {
+                $req = $req->withMethod(Request::POST);
+            }
+
+            if ($this->hasParam('postWithRequestBody') && $this->getParam('postWithRequestBody') == true) {
+                $request->setMethod(Request::POST);
+                $req = $req->withMethod(Request::POST);
+            }
+
+            $req = $req->withBody(
+                Psr7\stream_for(is_array($data)
+                    ? JSON::stringify($data, 'JSON_ELASTICSEARCH')
+                    : $data
+                )
+            );
+        }
+
+        return $req;
+    }
+
+    /**
+     * Return Guzzle resource.
+     *
+     * @param bool $persistent False if not persistent connection
+     *
+     * @return Client
+     */
+    protected function _getGuzzleClient($baseUrl, $persistent = true)
+    {
+        if (!$persistent || !self::$_guzzleClientConnection) {
+            self::$_guzzleClientConnection = new Client(array('base_uri' => $baseUrl));
+        }
+
+        return self::$_guzzleClientConnection;
+    }
+
+    /**
+     * Builds the base url for the guzzle connection.
+     *
+     * @param \Elastica\Connection $connection
+     *
+     * @return string
+     */
+    protected function _getBaseUrl(Connection $connection)
+    {
+        // If url is set, url is taken. Otherwise port, host and path
+        $url = $connection->hasConfig('url') ? $connection->getConfig('url') : '';
+
+        if (!empty($url)) {
+            $baseUri = $url;
+        } else {
+            $baseUri = (string) Uri::fromParts(array(
+                'scheme' => $this->_scheme,
+                'host' => $connection->getHost(),
+                'port' => $connection->getPort(),
+                'path' => ltrim('/', $connection->getPath()),
+            ));
+        }
+
+        return rtrim($baseUri, '/');
+    }
+
+    /**
+     * Builds the action path url for each request.
+     *
+     * @param \Elastica\Request $request
+     *
+     * @return string
+     */
+    protected function _getActionPath(Request $request)
+    {
+        $action = $request->getPath();
+        if ($action) {
+            $action = '/'.ltrim($action, '/');
+        }
+        $query = $request->getQuery();
+
+        if (!empty($query)) {
+            $action .= '?'.http_build_query($query);
+        }
+
+        return $action;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Http.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Http.php
index a9700f9..c605b30 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Http.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Http.php
@@ -3,44 +3,46 @@
 namespace Elastica\Transport;
 
 use Elastica\Exception\Connection\HttpException;
+use Elastica\Exception\PartialShardFailureException;
 use Elastica\Exception\ResponseException;
+use Elastica\JSON;
 use Elastica\Request;
 use Elastica\Response;
 
 /**
- * Elastica Http Transport object
+ * Elastica Http Transport object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class Http extends AbstractTransport
 {
     /**
-     * Http scheme
+     * Http scheme.
      *
      * @var string Http scheme
      */
     protected $_scheme = 'http';
 
     /**
-     * Curl resource to reuse
+     * Curl resource to reuse.
      *
      * @var resource Curl resource to reuse
      */
     protected static $_curlConnection = null;
 
     /**
-     * Makes calls to the elasticsearch server
+     * Makes calls to the elasticsearch server.
      *
      * All calls that are made to the server are done through this function
      *
-     * @param  \Elastica\Request                     $request
-     * @param  array                                $params  Host, Port, ...
+     * @param \Elastica\Request $request
+     * @param array             $params  Host, Port, ...
+     *
      * @throws \Elastica\Exception\ConnectionException
      * @throws \Elastica\Exception\ResponseException
      * @throws \Elastica\Exception\Connection\HttpException
-     * @return \Elastica\Response                    Response object
+     *
+     * @return \Elastica\Response Response object
      */
     public function exec(Request $request, array $params)
     {
@@ -49,12 +51,12 @@ public function exec(Request $request, array $params)
         $conn = $this->_getConnection($connection->isPersistent());
 
         // If url is set, url is taken. Otherwise port, host and path
-        $url = $connection->hasConfig('url')?$connection->getConfig('url'):'';
+        $url = $connection->hasConfig('url') ? $connection->getConfig('url') : '';
 
         if (!empty($url)) {
             $baseUri = $url;
         } else {
-            $baseUri = $this->_scheme . '://' . $connection->getHost() . ':' . $connection->getPort() . '/' . $connection->getPath();
+            $baseUri = $this->_scheme.'://'.$connection->getHost().':'.$connection->getPort().'/'.$connection->getPath();
         }
 
         $baseUri .= $request->getPath();
@@ -62,26 +64,50 @@ public function exec(Request $request, array $params)
         $query = $request->getQuery();
 
         if (!empty($query)) {
-            $baseUri .= '?' . http_build_query($query);
+            $baseUri .= '?'.http_build_query($query);
         }
 
         curl_setopt($conn, CURLOPT_URL, $baseUri);
         curl_setopt($conn, CURLOPT_TIMEOUT, $connection->getTimeout());
         curl_setopt($conn, CURLOPT_FORBID_REUSE, 0);
 
+        // Tell ES that we support the compressed responses
+        // An "Accept-Encoding" header containing all supported encoding types is sent
+        // curl will decode the response automatically if the response is encoded
+        curl_setopt($conn, CURLOPT_ENCODING, '');
+
+        /* @see Connection::setConnectTimeout() */
+        $connectTimeout = $connection->getConnectTimeout();
+        if ($connectTimeout > 0) {
+            curl_setopt($conn, CURLOPT_CONNECTTIMEOUT, $connectTimeout);
+        }
+
         $proxy = $connection->getProxy();
+
+        // See: https://github.com/facebook/hhvm/issues/4875
+        if (is_null($proxy) && defined('HHVM_VERSION')) {
+            $proxy = getenv('http_proxy') ?: null;
+        }
+
         if (!is_null($proxy)) {
             curl_setopt($conn, CURLOPT_PROXY, $proxy);
         }
 
+        $username = $connection->getUsername();
+        $password = $connection->getPassword();
+        if (!is_null($username) and !is_null($password)) {
+            curl_setopt($conn, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+            curl_setopt($conn, CURLOPT_USERPWD, "$username:$password");
+        }
+
         $this->_setupCurl($conn);
 
-        $headersConfig = $connection->hasConfig('headers')?$connection->getConfig('headers'):array();
+        $headersConfig = $connection->hasConfig('headers') ? $connection->getConfig('headers') : array();
 
         if (!empty($headersConfig)) {
             $headers = array();
             while (list($header, $headerValue) = each($headersConfig)) {
-                array_push($headers, $header . ': ' . $headerValue);
+                array_push($headers, $header.': '.$headerValue);
             }
 
             curl_setopt($conn, CURLOPT_HTTPHEADER, $headers);
@@ -91,13 +117,13 @@ public function exec(Request $request, array $params)
         $data = $request->getData();
         $httpMethod = $request->getMethod();
 
-        if (isset($data) && !empty($data)) {
+        if (!empty($data) || '0' === $data) {
             if ($this->hasParam('postWithRequestBody') && $this->getParam('postWithRequestBody') == true) {
                 $httpMethod = Request::POST;
             }
 
             if (is_array($data)) {
-                $content = json_encode($data);
+                $content = JSON::stringify($data, 'JSON_ELASTICSEARCH');
             } else {
                 $content = $data;
             }
@@ -105,18 +131,23 @@ public function exec(Request $request, array $params)
             // Escaping of / not necessary. Causes problems in base64 encoding of files
             $content = str_replace('\/', '/', $content);
 
-            curl_setopt($conn, CURLOPT_POSTFIELDS, $content);
+            if ($connection->hasCompression()) {
+                // Compress the body of the request ...
+                curl_setopt($conn, CURLOPT_POSTFIELDS, gzencode($content));
+
+                // ... and tell ES that it is compressed
+                curl_setopt($conn, CURLOPT_HTTPHEADER, array('Content-Encoding: gzip'));
+            } else {
+                curl_setopt($conn, CURLOPT_POSTFIELDS, $content);
+            }
+        } else {
+            curl_setopt($conn, CURLOPT_POSTFIELDS, '');
         }
 
         curl_setopt($conn, CURLOPT_NOBODY, $httpMethod == 'HEAD');
 
         curl_setopt($conn, CURLOPT_CUSTOMREQUEST, $httpMethod);
 
-        if (defined('DEBUG') && DEBUG) {
-            // Track request headers when in debug mode
-            curl_setopt($conn, CURLINFO_HEADER_OUT, true);
-        }
-
         $start = microtime(true);
 
         // cURL opt returntransfer leaks memory, therefore OB instead.
@@ -129,19 +160,21 @@ public function exec(Request $request, array $params)
         // Checks if error exists
         $errorNumber = curl_errno($conn);
 
-        $response = new Response($responseString);
-
-        if (defined('DEBUG') && DEBUG) {
-            $response->setQueryTime($end - $start);
-        }
-
+        $response = new Response($responseString, curl_getinfo($conn, CURLINFO_HTTP_CODE));
+        $response->setQueryTime($end - $start);
         $response->setTransferInfo(curl_getinfo($conn));
-
+        if ($connection->hasConfig('bigintConversion')) {
+            $response->setJsonBigintConversion($connection->getConfig('bigintConversion'));
+        }
 
         if ($response->hasError()) {
             throw new ResponseException($request, $response);
         }
 
+        if ($response->hasFailedShards()) {
+            throw new PartialShardFailureException($request, $response);
+        }
+
         if ($errorNumber > 0) {
             throw new HttpException($errorNumber, $request, $response);
         }
@@ -150,7 +183,7 @@ public function exec(Request $request, array $params)
     }
 
     /**
-     * Called to add additional curl params
+     * Called to add additional curl params.
      *
      * @param resource $curlConnection Curl connection
      */
@@ -164,9 +197,10 @@ protected function _setupCurl($curlConnection)
     }
 
     /**
-     * Return Curl resource
+     * Return Curl resource.
+     *
+     * @param bool $persistent False if not persistent connection
      *
-     * @param  bool     $persistent False if not persistent connection
      * @return resource Connection resource
      */
     protected function _getConnection($persistent = true)
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/HttpAdapter.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/HttpAdapter.php
new file mode 100755
index 0000000..f88aebe
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/HttpAdapter.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Elastica\Transport;
+
+use Elastica\Connection;
+use Elastica\Exception\PartialShardFailureException;
+use Elastica\Exception\ResponseException;
+use Elastica\JSON;
+use Elastica\Request as ElasticaRequest;
+use Elastica\Response as ElasticaResponse;
+use Ivory\HttpAdapter\HttpAdapterInterface;
+use Ivory\HttpAdapter\Message\Request as HttpAdapterRequest;
+use Ivory\HttpAdapter\Message\Response as HttpAdapterResponse;
+use Ivory\HttpAdapter\Message\Stream\StringStream;
+
+class HttpAdapter extends AbstractTransport
+{
+    /**
+     * @var HttpAdapterInterface
+     */
+    private $httpAdapter;
+
+    /**
+     * @var string
+     */
+    private $_scheme = 'http';
+
+    /**
+     * Construct transport.
+     *
+     * @param Connection           $connection
+     * @param HttpAdapterInterface $httpAdapter
+     */
+    public function __construct(Connection $connection = null, HttpAdapterInterface $httpAdapter)
+    {
+        parent::__construct($connection);
+        $this->httpAdapter = $httpAdapter;
+    }
+
+    /**
+     * Makes calls to the elasticsearch server.
+     *
+     * All calls that are made to the server are done through this function
+     *
+     * @param \Elastica\Request $elasticaRequest
+     * @param array             $params          Host, Port, ...
+     *
+     * @throws \Elastica\Exception\ConnectionException
+     * @throws \Elastica\Exception\ResponseException
+     * @throws \Elastica\Exception\Connection\HttpException
+     *
+     * @return \Elastica\Response Response object
+     */
+    public function exec(ElasticaRequest $elasticaRequest, array $params)
+    {
+        $connection = $this->getConnection();
+
+        if ($timeout = $connection->getTimeout()) {
+            $this->httpAdapter->getConfiguration()->setTimeout($timeout);
+        }
+
+        $httpAdapterRequest = $this->_createHttpAdapterRequest($elasticaRequest, $connection);
+
+        $start = microtime(true);
+        $httpAdapterResponse = $this->httpAdapter->sendRequest($httpAdapterRequest);
+        $end = microtime(true);
+
+        $elasticaResponse = $this->_createElasticaResponse($httpAdapterResponse, $connection);
+        $elasticaResponse->setQueryTime($end - $start);
+
+        $elasticaResponse->setTransferInfo(
+            array(
+                'request_header' => $httpAdapterRequest->getMethod(),
+                'http_code' => $httpAdapterResponse->getStatusCode(),
+            )
+        );
+
+        if ($elasticaResponse->hasError()) {
+            throw new ResponseException($elasticaRequest, $elasticaResponse);
+        }
+
+        if ($elasticaResponse->hasFailedShards()) {
+            throw new PartialShardFailureException($elasticaRequest, $elasticaResponse);
+        }
+
+        return $elasticaResponse;
+    }
+
+    /**
+     * @param HttpAdapterResponse $httpAdapterResponse
+     *
+     * @return ElasticaResponse
+     */
+    protected function _createElasticaResponse(HttpAdapterResponse $httpAdapterResponse)
+    {
+        return new ElasticaResponse((string) $httpAdapterResponse->getBody(), $httpAdapterResponse->getStatusCode());
+    }
+
+    /**
+     * @param ElasticaRequest $elasticaRequest
+     * @param Connection      $connection
+     *
+     * @return HttpAdapterRequest
+     */
+    protected function _createHttpAdapterRequest(ElasticaRequest $elasticaRequest, Connection $connection)
+    {
+        $data = $elasticaRequest->getData();
+        $body = null;
+        $method = $elasticaRequest->getMethod();
+        $headers = $connection->hasConfig('headers') ?: array();
+        if (!empty($data) || '0' === $data) {
+            if ($method == ElasticaRequest::GET) {
+                $method = ElasticaRequest::POST;
+            }
+
+            if ($this->hasParam('postWithRequestBody') && $this->getParam('postWithRequestBody') == true) {
+                $elasticaRequest->setMethod(ElasticaRequest::POST);
+                $method = ElasticaRequest::POST;
+            }
+
+            if (is_array($data)) {
+                $body = JSON::stringify($data, 'JSON_ELASTICSEARCH');
+            } else {
+                $body = $data;
+            }
+        }
+
+        $url = $this->_getUri($elasticaRequest, $connection);
+        $streamBody = new StringStream($body);
+
+        return new HttpAdapterRequest($url, $method, HttpAdapterRequest::PROTOCOL_VERSION_1_1, $headers, $streamBody);
+    }
+
+    /**
+     * @param ElasticaRequest      $request
+     * @param \Elastica\Connection $connection
+     *
+     * @return string
+     */
+    protected function _getUri(ElasticaRequest $request, Connection $connection)
+    {
+        $url = $connection->hasConfig('url') ? $connection->getConfig('url') : '';
+
+        if (!empty($url)) {
+            $baseUri = $url;
+        } else {
+            $baseUri = $this->_scheme.'://'.$connection->getHost().':'.$connection->getPort().'/'.$connection->getPath();
+        }
+
+        $baseUri .= $request->getPath();
+
+        $query = $request->getQuery();
+
+        if (!empty($query)) {
+            $baseUri .= '?'.http_build_query($query);
+        }
+
+        return $baseUri;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Https.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Https.php
index 6470403..996bb21 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Https.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Https.php
@@ -3,23 +3,21 @@
 namespace Elastica\Transport;
 
 /**
- * Elastica Http Transport object
+ * Elastica Http Transport object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 class Https extends Http
 {
     /**
-     * Https scheme
+     * Https scheme.
      *
      * @var string https scheme
      */
     protected $_scheme = 'https';
 
     /**
-     * Overloads setupCurl to set SSL params
+     * Overloads setupCurl to set SSL params.
      *
      * @param resource $connection Curl connection resource
      */
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Null.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Null.php
index c9eac9b..4c05aa7 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Null.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/Null.php
@@ -2,42 +2,13 @@
 
 namespace Elastica\Transport;
 
-use Elastica\Request;
-use Elastica\Response;
-
 /**
- * Elastica Null Transport object
+ * Elastica Null Transport object.
+ *
+ * This class is for backward compatibility reason for all php < 7 versions. For PHP 7 and above use NullTransport as Null is reserved.
  *
- * @package Elastica
  * @author James Boehmer <james.boehmer@jamesboehmer.com>
  */
-class Null extends AbstractTransport
+class Null extends NullTransport
 {
-    /**
-     * Null transport.
-     *
-     * @param \Elastica\Request $request
-     * @param  array             $params Hostname, port, path, ...
-     * @return \Elastica\Response Response empty object
-     */
-    public function exec(Request $request, array $params)
-    {
-        $response = array(
-                "took" => 0,
-                "timed_out" => FALSE,
-                "_shards" => array(
-                        "total" => 0,
-                        "successful" => 0,
-                        "failed" => 0
-                        ),
-                "hits" => array(
-                        "total" => 0,
-                        "max_score" => NULL,
-                        "hits" => array()
-                        ),
-                "params" => $params
-                );
-
-         return new Response(json_encode($response));
-    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/NullTransport.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/NullTransport.php
new file mode 100755
index 0000000..f55d056
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Transport/NullTransport.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Elastica\Transport;
+
+use Elastica\JSON;
+use Elastica\Request;
+use Elastica\Response;
+
+/**
+ * Elastica Null Transport object.
+ *
+ * This is used in case you just need a test transport that doesn't do any connection to an elasticsearch
+ * host but still returns a valid response object
+ *
+ * @author James Boehmer <james.boehmer@jamesboehmer.com>
+ */
+class NullTransport extends AbstractTransport
+{
+    /**
+     * Null transport.
+     *
+     * @param \Elastica\Request $request
+     * @param array             $params  Hostname, port, path, ...
+     *
+     * @return \Elastica\Response Response empty object
+     */
+    public function exec(Request $request, array $params)
+    {
+        $response = array(
+            'took' => 0,
+            'timed_out' => false,
+            '_shards' => array(
+                'total' => 0,
+                'successful' => 0,
+                'failed' => 0,
+            ),
+            'hits' => array(
+                'total' => 0,
+                'max_score' => null,
+                'hits' => array(),
+            ),
+            'params' => $params,
+        );
+
+        return new Response(JSON::stringify($response));
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type.php
index da2882f..77dd9a0 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type.php
@@ -2,35 +2,34 @@
 
 namespace Elastica;
 
-use Elastica\Document;
-use Elastica\Exception\RuntimeException;
+use Elastica\Exception\DeprecatedException;
 use Elastica\Exception\InvalidException;
 use Elastica\Exception\NotFoundException;
-use Elastica\Exception\ResponseException;
+use Elastica\Exception\RuntimeException;
+use Elastica\ResultSet\BuilderInterface;
+use Elastica\Script\AbstractScript;
 use Elastica\Type\Mapping;
 
 /**
- * Elastica type object
+ * Elastica type object.
  *
  * elasticsearch has for every types as a substructure. This object
  * represents a type inside a context
  * The hierarchy is as following: client -> index -> type -> document
  *
- * @category Xodoa
- * @package  Elastica
  * @author   Nicolas Ruflin <spam@ruflin.com>
  */
 class Type implements SearchableInterface
 {
     /**
-     * Index
+     * Index.
      *
      * @var \Elastica\Index Index object
      */
     protected $_index = null;
 
     /**
-     * Type name
+     * Type name.
      *
      * @var string Type name
      */
@@ -42,10 +41,10 @@ class Type implements SearchableInterface
     protected $_serializer;
 
     /**
-     * Creates a new type object inside the given index
+     * Creates a new type object inside the given index.
      *
      * @param \Elastica\Index $index Index Object
-     * @param string         $name  Type name
+     * @param string          $name  Type name
      */
     public function __construct(Index $index, $name)
     {
@@ -54,9 +53,10 @@ public function __construct(Index $index, $name)
     }
 
     /**
-     * Adds the given document to the search index
+     * Adds the given document to the search index.
+     *
+     * @param \Elastica\Document $doc Document with data
      *
-     * @param  \Elastica\Document $doc Document with data
      * @return \Elastica\Response
      */
     public function addDocument(Document $doc)
@@ -92,7 +92,7 @@ public function addDocument(Document $doc)
         $data = $response->getData();
         // set autogenerated id to document
         if (($doc->isAutoPopulate()
-            || $this->getIndex()->getClient()->getConfigValue(array('document', 'autoPopulate'), false))
+                || $this->getIndex()->getClient()->getConfigValue(array('document', 'autoPopulate'), false))
             && $response->isOk()
         ) {
             if (!$doc->hasId()) {
@@ -111,8 +111,10 @@ public function addDocument(Document $doc)
     /**
      * @param $object
      * @param Document $doc
-     * @return Response
+     *
      * @throws Exception\RuntimeException
+     *
+     * @return Response
      */
     public function addObject($object, Document $doc = null)
     {
@@ -130,37 +132,64 @@ public function addObject($object, Document $doc = null)
     }
 
     /**
-     * Update document, using update script. Requires elasticsearch >= 0.19.0
+     * Update document, using update script. Requires elasticsearch >= 0.19.0.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update.html
+     *
+     * @param \Elastica\Document|\Elastica\Script\AbstractScript $data    Document with update data
+     * @param array                                              $options array of query params to use for query. For possible options check es api
      *
-     * @param  \Elastica\Document|\Elastica\Script                   $data Document with update data
      * @throws \Elastica\Exception\InvalidException
+     *
      * @return \Elastica\Response
-     * @link http://www.elasticsearch.org/guide/reference/api/update.html
      */
-    public function updateDocument($data)
+    public function updateDocument($data, array $options = array())
     {
-        if (!($data instanceof Document) && !($data instanceof Script)) {
-            throw new \InvalidArgumentException("Data should be a Document or Script");
+        if (!($data instanceof Document) && !($data instanceof AbstractScript)) {
+            throw new \InvalidArgumentException('Data should be a Document or Script');
         }
 
         if (!$data->hasId()) {
             throw new InvalidException('Document or Script id is not set');
         }
 
+        $id = urlencode($data->getId());
+
         return $this->getIndex()->getClient()->updateDocument(
-            $data->getId(),
+            $id,
             $data,
             $this->getIndex()->getName(),
-            $this->getName()
+            $this->getName(),
+            $options
         );
     }
 
     /**
-     * Uses _bulk to send documents to the server
+     * Uses _bulk to send documents to the server.
+     *
+     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     *
+     * @return \Elastica\Bulk\ResponseSet
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
+     */
+    public function updateDocuments(array $docs)
+    {
+        foreach ($docs as $doc) {
+            $doc->setType($this->getName());
+        }
+
+        return $this->getIndex()->updateDocuments($docs);
+    }
+
+    /**
+     * Uses _bulk to send documents to the server.
+     *
+     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
      *
-     * @param  array|\Elastica\Document[] $docs Array of Elastica\Document
      * @return \Elastica\Bulk\ResponseSet
-     * @link http://www.elasticsearch.org/guide/reference/api/bulk.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
      */
     public function addDocuments(array $docs)
     {
@@ -172,11 +201,13 @@ public function addDocuments(array $docs)
     }
 
     /**
-     * Uses _bulk to send documents to the server
+     * Uses _bulk to send documents to the server.
      *
      * @param objects[] $objects
+     *
      * @return \Elastica\Bulk\ResponseSet
-     * @link http://www.elasticsearch.org/guide/reference/api/bulk.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
      */
     public function addObjects(array $objects)
     {
@@ -197,25 +228,25 @@ public function addObjects(array $objects)
     }
 
     /**
-     * Get the document from search index
+     * Get the document from search index.
+     *
+     * @param string $id      Document id
+     * @param array  $options Options for the get request.
      *
-     * @param  string                               $id      Document id
-     * @param  array                                $options Options for the get request.
      * @throws \Elastica\Exception\NotFoundException
+     * @throws \Elastica\Exception\ResponseException
+     *
      * @return \Elastica\Document
      */
     public function getDocument($id, $options = array())
     {
         $path = urlencode($id);
 
-        try {
-            $result = $this->request($path, Request::GET, array(), $options)->getData();
-        } catch (ResponseException $e) {
-            throw new NotFoundException('doc id ' . $id . ' not found');
-        }
+        $response = $this->request($path, Request::GET, array(), $options);
+        $result = $response->getData();
 
-        if (empty($result['exists'])) {
-            throw new NotFoundException('doc id ' . $id . ' not found');
+        if (!isset($result['found']) || $result['found'] === false) {
+            throw new NotFoundException('doc id '.$id.' not found');
         }
 
         if (isset($result['fields'])) {
@@ -233,8 +264,9 @@ public function getDocument($id, $options = array())
     }
 
     /**
-     * @param string $id
+     * @param string       $id
      * @param array|string $data
+     *
      * @return Document
      */
     public function createDocument($id = '', $data = array())
@@ -246,7 +278,7 @@ public function createDocument($id = '', $data = array())
     }
 
     /**
-     * Returns the type name
+     * Returns the type name.
      *
      * @return string Type name
      */
@@ -256,9 +288,10 @@ public function getName()
     }
 
     /**
-     * Sets value type mapping for this type
+     * Sets value type mapping for this type.
+     *
+     * @param \Elastica\Type\Mapping|array $mapping Elastica\Type\MappingType object or property array with all mappings
      *
-     * @param  \Elastica\Type\Mapping|array $mapping Elastica\Type\MappingType object or property array with all mappings
      * @return \Elastica\Response
      */
     public function setMapping($mapping)
@@ -270,7 +303,7 @@ public function setMapping($mapping)
     }
 
     /**
-     * Returns current mapping for the given type
+     * Returns current mapping for the given type.
      *
      * @return array Current mapping
      */
@@ -279,33 +312,41 @@ public function getMapping()
         $path = '_mapping';
 
         $response = $this->request($path, Request::GET);
+        $data = $response->getData();
 
-        return $response->getData();
+        $mapping = array_shift($data);
+        if (isset($mapping['mappings'])) {
+            return $mapping['mappings'];
+        }
+
+        return array();
     }
 
     /**
-     * Create search object
+     * Create search object.
+     *
+     * @param string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
+     * @param int|array $options OPTIONAL Limit or associative array of options (option=>value)
+     * @param BuilderInterface $builder
      *
-     * @param  string|array|\Elastica\Query $query   Array with all query data inside or a Elastica\Query object
-     * @param  int|array                   $options OPTIONAL Limit or associative array of options (option=>value)
-     * @return \Elastica\Search
+     * @return Search
      */
-    public function createSearch($query = '', $options = null)
+    public function createSearch($query = '', $options = null, BuilderInterface $builder = null)
     {
-        $search = new Search($this->getIndex()->getClient());
-        $search->addIndex($this->getIndex());
+        $search = $this->getIndex()->createSearch($query, $options, $builder);
         $search->addType($this);
-        $search->setOptionsAndQuery($options, $query);
 
         return $search;
     }
 
     /**
-     * Do a search on this type
+     * Do a search on this type.
+     *
+     * @param string|array|\Elastica\Query $query   Array with all query data inside or a Elastica\Query object
+     * @param int|array                    $options OPTIONAL Limit or associative array of options (option=>value)
+     *
+     * @return \Elastica\ResultSet with all results inside
      *
-     * @param  string|array|\Elastica\Query $query   Array with all query data inside or a Elastica\Query object
-     * @param  int|array                   $options OPTIONAL Limit or associative array of options (option=>value)
-     * @return \Elastica\ResultSet          ResultSet with all results inside
      * @see \Elastica\SearchableInterface::search
      */
     public function search($query = '', $options = null)
@@ -316,10 +357,12 @@ public function search($query = '', $options = null)
     }
 
     /**
-     * Count docs by query
+     * Count docs by query.
+     *
+     * @param string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
+     *
+     * @return int number of documents matching the query
      *
-     * @param  string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
-     * @return int                         number of documents matching the query
      * @see \Elastica\SearchableInterface::count
      */
     public function count($query = '')
@@ -330,7 +373,7 @@ public function count($query = '')
     }
 
     /**
-     * Returns index client
+     * Returns index client.
      *
      * @return \Elastica\Index Index object
      */
@@ -341,6 +384,7 @@ public function getIndex()
 
     /**
      * @param \Elastica\Document $document
+     *
      * @return \Elastica\Response
      */
     public function deleteDocument(Document $document)
@@ -354,21 +398,43 @@ public function deleteDocument(Document $document)
                 'replication',
                 'consistency',
                 'refresh',
-                'timeout'
+                'timeout',
             )
         );
+
         return $this->deleteById($document->getId(), $options);
     }
 
     /**
-     * Deletes an entry by its unique identifier
+     * Uses _bulk to delete documents from the server.
+     *
+     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     *
+     * @return \Elastica\Bulk\ResponseSet
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
+     */
+    public function deleteDocuments(array $docs)
+    {
+        foreach ($docs as $doc) {
+            $doc->setType($this->getName());
+        }
+
+        return $this->getIndex()->deleteDocuments($docs);
+    }
+
+    /**
+     * Deletes an entry by its unique identifier.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete.html
+     *
+     * @param int|string $id      Document id
+     * @param array      $options
      *
-     * @param  int|string               $id Document id
-     * @param array $options
      * @throws \InvalidArgumentException
      * @throws \Elastica\Exception\NotFoundException
-     * @return \Elastica\Response        Response object
-     * @link http://www.elasticsearch.org/guide/reference/api/delete.html
+     *
+     * @return \Elastica\Response Response object
      */
     public function deleteById($id, array $options = array())
     {
@@ -383,100 +449,95 @@ public function deleteById($id, array $options = array())
         $responseData = $response->getData();
 
         if (isset($responseData['found']) && false == $responseData['found']) {
-            throw new NotFoundException('Doc id ' . $id . ' not found and can not be deleted');
+            throw new NotFoundException('Doc id '.$id.' not found and can not be deleted');
         }
 
         return $response;
     }
 
     /**
-     * Deletes the given list of ids from this type
+     * Deletes the given list of ids from this type.
      *
-     * @param  array             $ids
-     * @return \Elastica\Response Response object
+     * @param array       $ids
+     * @param string|bool $routing Optional routing key for all ids
+     *
+     * @return \Elastica\Response Response  object
      */
-    public function deleteIds(array $ids)
+    public function deleteIds(array $ids, $routing = false)
     {
-        return $this->getIndex()->getClient()->deleteIds($ids, $this->getIndex(), $this);
+        return $this->getIndex()->getClient()->deleteIds($ids, $this->getIndex(), $this, $routing);
     }
 
     /**
-     * Deletes entries in the db based on a query
+     * Deletes entries in the db based on a query.
+     *
+     * @param \Elastica\Query|string $query   Query object
+     * @param array                  $options Optional params
      *
-     * @param  \Elastica\Query|string $query Query object
      * @return \Elastica\Response
-     * @link http://www.elasticsearch.org/guide/reference/api/delete-by-query.html
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html
      */
-    public function deleteByQuery($query)
+    public function deleteByQuery($query, array $options = array())
     {
+        if (is_string($query)) {
+            // query_string queries are not supported for delete by query operations
+            $options['q'] = $query;
+
+            return $this->request('_query', Request::DELETE, array(), $options);
+        }
         $query = Query::create($query);
 
-        return $this->request('_query', Request::DELETE, $query->getQuery());
+        return $this->request('_query', Request::DELETE, array('query' => is_array($query) ? $query : $query->toArray()), $options);
     }
 
     /**
      * Deletes the index type.
      *
-     * @return \Elastica\Response
+     * @deprecated It is no longer possible to delete the mapping for a type. Instead you should delete the index and recreate it with the new mappings. This method will be removed in further Elastica releases.
+     *
+     * @throws DeprecatedException It is no longer possible to delete the mapping for a type. Instead you should delete the index and recreate it with the new mappings. This method will be removed in further Elastica releases.
      */
     public function delete()
     {
-        $response = $this->request('', Request::DELETE);
-
-        return $response;
+        throw new DeprecatedException('It is no longer possible to delete the mapping for a type. Instead you should delete the index and recreate it with the new mappings. This method will be removed in further Elastica releases.');
     }
 
     /**
-     * More like this query based on the given object
+     * Makes calls to the elasticsearch server based on this type.
      *
-     * The id in the given object has to be set
+     * @param string $path   Path to call
+     * @param string $method Rest method to use (GET, POST, DELETE, PUT)
+     * @param array  $data   OPTIONAL Arguments as array
+     * @param array  $query  OPTIONAL Query params
      *
-     * @param  \Elastica\Document           $doc    Document to query for similar objects
-     * @param  array                       $params OPTIONAL Additional arguments for the query
-     * @param  string|array|\Elastica\Query $query  OPTIONAL Query to filter the moreLikeThis results
-     * @return \Elastica\ResultSet          ResultSet with all results inside
-     * @link http://www.elasticsearch.org/guide/reference/api/more-like-this.html
-     */
-    public function moreLikeThis(Document $doc, $params = array(), $query = array())
-    {
-        $path = $doc->getId() . '/_mlt';
-
-        $query = Query::create($query);
-
-        $response = $this->request($path, Request::GET, $query->toArray(), $params);
-
-        return new ResultSet($response, $query);
-    }
-
-    /**
-     * Makes calls to the elasticsearch server based on this type
-     *
-     * @param  string            $path   Path to call
-     * @param  string            $method Rest method to use (GET, POST, DELETE, PUT)
-     * @param  array             $data   OPTIONAL Arguments as array
-     * @param  array             $query  OPTIONAL Query params
      * @return \Elastica\Response Response object
      */
     public function request($path, $method, $data = array(), array $query = array())
     {
-        $path = $this->getName() . '/' . $path;
+        $path = $this->getName().'/'.$path;
 
         return $this->getIndex()->request($path, $method, $data, $query);
     }
 
     /**
-     * Sets the serializer callable used in addObject
+     * Sets the serializer callable used in addObject.
+     *
      * @see \Elastica\Type::addObject
      *
-     * @param array|string $serializer  @see \Elastica\Type::_serializer
+     * @param array|string $serializer @see \Elastica\Type::_serializer
+     *
+     * @return $this
      */
     public function setSerializer($serializer)
     {
         $this->_serializer = $serializer;
+
+        return $this;
     }
 
     /**
-     * Checks if the given type exists in Index
+     * Checks if the given type exists in Index.
      *
      * @return bool True if type exists
      */
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type/AbstractType.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type/AbstractType.php
index ba2e043..15f3682 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type/AbstractType.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type/AbstractType.php
@@ -24,8 +24,7 @@
  *    - $_indexParams: Parameters for the index
  *
  * @todo Add some settings examples to code
- * @category Xodoa
- * @package Elastica
+ *
  * @author Nicolas Ruflin <spam@ruflin.com>
  */
 abstract class AbstractType implements SearchableInterface
@@ -33,68 +32,69 @@ abstract class AbstractType implements SearchableInterface
     const MAX_DOCS_PER_REQUEST = 1000;
 
     /**
-     * Index name
+     * Index name.
      *
      * @var string Index name
      */
     protected $_indexName = '';
 
     /**
-     * Index name
+     * Index name.
      *
      * @var string Index name
      */
     protected $_typeName = '';
 
     /**
-     * Client
+     * Client.
      *
      * @var \Elastica\Client Client object
      */
     protected $_client = null;
 
     /**
-     * Index
+     * Index.
      *
      * @var \Elastica\Index Index object
      */
     protected $_index = null;
 
     /**
-     * Type
+     * Type.
      *
      * @var \Elastica\Type Type object
      */
     protected $_type = null;
 
     /**
-     * Mapping
+     * Mapping.
      *
      * @var array Mapping
      */
     protected $_mapping = array();
 
     /**
-     * Index params
+     * Index params.
      *
      * @var array Index  params
      */
     protected $_indexParams = array();
 
     /**
-     * Source
+     * Source.
      *
-     * @var boolean Source
+     * @var bool Source
      */
     protected $_source = true;
 
     /**
-     * Creates index object with client connection
+     * Creates index object with client connection.
      *
      * Reads index and type name from protected vars _indexName and _typeName.
      * Has to be set in child class
      *
-     * @param  \Elastica\Client                     $client OPTIONAL Client object
+     * @param \Elastica\Client $client OPTIONAL Client object
+     *
      * @throws \Elastica\Exception\InvalidException
      */
     public function __construct(Client $client = null)
@@ -117,7 +117,7 @@ public function __construct(Client $client = null)
     }
 
     /**
-     * Creates the index and sets the mapping for this type
+     * Creates the index and sets the mapping for this type.
      *
      * @param bool $recreate OPTIONAL Recreates the index if true (default = false)
      */
@@ -132,8 +132,9 @@ public function create($recreate = false)
     }
 
     /**
-     * @param \Elastica\Query $query
-     * @param array|int $options
+     * @param string|\Elastica\Query $query
+     * @param array|int              $options
+     *
      * @return \Elastica\Search
      */
     public function createSearch($query = '', $options = null)
@@ -142,10 +143,13 @@ public function createSearch($query = '', $options = null)
     }
 
     /**
-     * Search on the type
+     * Search on the type.
+     *
+     * @param string|array|\Elastica\Query $query   Array with all query data inside or a Elastica\Query object
+     * @param null                         $options
+     *
+     * @return \Elastica\ResultSet with all results inside
      *
-     * @param  string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
-     * @return \Elastica\ResultSet          ResultSet with all results inside
      * @see \Elastica\SearchableInterface::search
      */
     public function search($query = '', $options = null)
@@ -154,10 +158,12 @@ public function search($query = '', $options = null)
     }
 
     /**
-     * Count docs in the type based on query
+     * Count docs in the type based on query.
+     *
+     * @param string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
+     *
+     * @return int number of documents matching the query
      *
-     * @param  string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
-     * @return int                         number of documents matching the query
      * @see \Elastica\SearchableInterface::count
      */
     public function count($query = '')
@@ -166,7 +172,7 @@ public function count($query = '')
     }
 
     /**
-     * Returns the search index
+     * Returns the search index.
      *
      * @return \Elastica\Index Index object
      */
@@ -176,7 +182,7 @@ public function getIndex()
     }
 
     /**
-     * Returns type object
+     * Returns type object.
      *
      * @return \Elastica\Type Type object
      */
@@ -186,11 +192,12 @@ public function getType()
     }
 
     /**
-     * Converts given time to format: 1995-12-31T23:59:59Z
+     * Converts given time to format: 1995-12-31T23:59:59Z.
      *
      * This is the lucene date format
      *
-     * @param  int    $date Date input (could be string etc.) -> must be supported by strtotime
+     * @param int $date Date input (could be string etc.) -> must be supported by strtotime
+     *
      * @return string Converted date string
      */
     public function convertDate($date)
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type/Mapping.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type/Mapping.php
index b281a5d..8603c06 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type/Mapping.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Type/Mapping.php
@@ -7,34 +7,33 @@
 use Elastica\Type;
 
 /**
- * Elastica Mapping object
+ * Elastica Mapping object.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/mapping/
+ *
+ * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html
  */
 class Mapping
 {
     /**
-     * Mapping
+     * Mapping.
      *
      * @var array Mapping
      */
     protected $_mapping = array();
 
     /**
-     * Type
+     * Type.
      *
      * @var \Elastica\Type Type object
      */
     protected $_type = null;
 
     /**
-     * Construct Mapping
+     * Construct Mapping.
      *
      * @param \Elastica\Type $type       OPTIONAL Type object
-     * @param array         $properties OPTIONAL Properties
+     * @param array          $properties OPTIONAL Properties
      */
     public function __construct(Type $type = null, array $properties = array())
     {
@@ -50,8 +49,10 @@ public function __construct(Type $type = null, array $properties = array())
     /**
      * Sets the mapping type
      * Enter description here ...
-     * @param  \Elastica\Type             $type Type object
-     * @return \Elastica\Type\Mapping Current object
+     *
+     * @param \Elastica\Type $type Type object
+     *
+     * @return $this
      */
     public function setType(Type $type)
     {
@@ -61,10 +62,11 @@ public function setType(Type $type)
     }
 
     /**
-     * Sets the mapping properties
+     * Sets the mapping properties.
      *
-     * @param  array                     $properties Properties
-     * @return \Elastica\Type\Mapping Mapping object
+     * @param array $properties Properties
+     *
+     * @return $this
      */
     public function setProperties(array $properties)
     {
@@ -72,10 +74,23 @@ public function setProperties(array $properties)
     }
 
     /**
-     * Sets the mapping _meta
+     * Gets the mapping properties.
+     *
+     * @return array $properties Properties
+     */
+    public function getProperties()
+    {
+        return $this->getParam('properties');
+    }
+
+    /**
+     * Sets the mapping _meta.
+     *
      * @param array $meta metadata
-     * @return \Elastica\Type\Mapping Mapping object
-     * @link http://www.elasticsearch.org/guide/reference/mapping/meta.html
+     *
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-meta.html
      */
     public function setMeta(array $meta)
     {
@@ -83,7 +98,7 @@ public function setMeta(array $meta)
     }
 
     /**
-     * Returns mapping type
+     * Returns mapping type.
      *
      * @return \Elastica\Type Type
      */
@@ -93,14 +108,16 @@ public function getType()
     }
 
     /**
-     * Sets source values
+     * Sets source values.
      *
      * To disable source, argument is
      * array('enabled' => false)
      *
-     * @param  array                     $source Source array
-     * @return \Elastica\Type\Mapping Current object
-     * @link http://www.elasticsearch.org/guide/reference/mapping/source-field.html
+     * @param array $source Source array
+     *
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-source-field.html
      */
     public function setSource(array $source)
     {
@@ -108,12 +125,13 @@ public function setSource(array $source)
     }
 
     /**
-     * Disables the source in the index
+     * Disables the source in the index.
      *
      * Param can be set to true to enable again
      *
-     * @param  bool                      $enabled OPTIONAL (default = false)
-     * @return \Elastica\Type\Mapping Current object
+     * @param bool $enabled OPTIONAL (default = false)
+     *
+     * @return $this
      */
     public function disableSource($enabled = false)
     {
@@ -121,7 +139,7 @@ public function disableSource($enabled = false)
     }
 
     /**
-     * Sets raw parameters
+     * Sets raw parameters.
      *
      * Possible options:
      * _uid
@@ -137,9 +155,10 @@ public function disableSource($enabled = false)
      * _size
      * properties
      *
-     * @param  string                    $key   Key name
-     * @param  mixed                     $value Key value
-     * @return \Elastica\Type\Mapping Current object
+     * @param string $key   Key name
+     * @param mixed  $value Key value
+     *
+     * @return $this
      */
     public function setParam($key, $value)
     {
@@ -149,10 +168,25 @@ public function setParam($key, $value)
     }
 
     /**
-     * Sets params for the "_all" field
+     * Get raw parameters.
+     *
+     * @see setParam
      *
-     * @param array                       $params _all Params (enabled, store, term_vector, analyzer)
-     * @return \Elastica\Type\Mapping
+     * @param string $key Key name
+     *
+     * @return mixed $value Key value
+     */
+    public function getParam($key)
+    {
+        return isset($this->_mapping[$key]) ? $this->_mapping[$key] : null;
+    }
+
+    /**
+     * Sets params for the "_all" field.
+     *
+     * @param array $params _all Params (enabled, store, term_vector, analyzer)
+     *
+     * @return $this
      */
     public function setAllField(array $params)
     {
@@ -160,10 +194,11 @@ public function setAllField(array $params)
     }
 
     /**
-     * Enables the "_all" field
+     * Enables the "_all" field.
+     *
+     * @param bool $enabled OPTIONAL (default = true)
      *
-     * @param  bool                      $enabled OPTIONAL (default = true)
-     * @return \Elastica\Type\Mapping
+     * @return $this
      */
     public function enableAllField($enabled = true)
     {
@@ -171,22 +206,23 @@ public function enableAllField($enabled = true)
     }
 
     /**
-     * Set TTL
+     * Set TTL.
      *
-     * @param  array                     $params TTL Params (enabled, default, ...)
-     * @return \Elastica\Type\Mapping
+     * @param array $params TTL Params (enabled, default, ...)
+     *
+     * @return $this
      */
     public function setTtl(array $params)
     {
         return $this->setParam('_ttl', $params);
-
     }
 
     /**
-     * Enables TTL for all documents in this type
+     * Enables TTL for all documents in this type.
      *
-     * @param  bool                      $enabled OPTIONAL (default = true)
-     * @return \Elastica\Type\Mapping
+     * @param bool $enabled OPTIONAL (default = true)
+     *
+     * @return $this
      */
     public function enableTtl($enabled = true)
     {
@@ -194,10 +230,11 @@ public function enableTtl($enabled = true)
     }
 
     /**
-     * Set parent type
+     * Set parent type.
+     *
+     * @param string $type Parent type
      *
-     * @param string                     $type Parent type
-     * @return \Elastica\Type\Mapping
+     * @return $this
      */
     public function setParent($type)
     {
@@ -205,10 +242,11 @@ public function setParent($type)
     }
 
     /**
-     * Converts the mapping to an array
+     * Converts the mapping to an array.
      *
      * @throws \Elastica\Exception\InvalidException
-     * @return array                               Mapping as array
+     *
+     * @return array Mapping as array
      */
     public function toArray()
     {
@@ -222,34 +260,38 @@ public function toArray()
     }
 
     /**
-     * Submits the mapping and sends it to the server
+     * Submits the mapping and sends it to the server.
+     *
+     * @param array $query Query string parameters to send with mapping
      *
      * @return \Elastica\Response Response object
      */
-    public function send()
+    public function send(array $query = array())
     {
         $path = '_mapping';
 
-        return $this->getType()->request($path, Request::PUT, $this->toArray());
+        return $this->getType()->request($path, Request::PUT, $this->toArray(), $query);
     }
 
     /**
-     * Creates a mapping object
+     * Creates a mapping object.
+     *
+     * @param array|\Elastica\Type\Mapping $mapping Mapping object or properties array
      *
-     * @param  array|\Elastica\Type\Mapping     $mapping Mapping object or properties array
-     * @return \Elastica\Type\Mapping           Mapping object
      * @throws \Elastica\Exception\InvalidException If invalid type
+     *
+     * @return self
      */
     public static function create($mapping)
     {
         if (is_array($mapping)) {
-            $mappingObject = new Mapping();
+            $mappingObject = new self();
             $mappingObject->setProperties($mapping);
         } else {
             $mappingObject = $mapping;
         }
 
-        if (!$mappingObject instanceof Mapping) {
+        if (!$mappingObject instanceof self) {
             throw new InvalidException('Invalid object type');
         }
 
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Util.php b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Util.php
index 50b82e8..a1ba71c 100755
--- a/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Util.php
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Elastica/Util.php
@@ -3,25 +3,26 @@
 namespace Elastica;
 
 /**
- * Elastica tools
+ * Elastica tools.
  *
- * @category Xodoa
- * @package Elastica
  * @author Nicolas Ruflin <spam@ruflin.com>
  * @author Thibault Duplessis <thibault.duplessis@gmail.com>
  * @author Oleg Zinchenko <olegz@default-value.com>
+ * @author Roberto Nygaard <roberto@nygaard.es>
  */
 class Util
 {
     /**
      * Replace the following reserved words: AND OR NOT
      * and
-     * escapes the following terms: + - && || ! ( ) { } [ ] ^ " ~ * ? : \
+     * escapes the following terms: + - && || ! ( ) { } [ ] ^ " ~ * ? : \.
      *
-     * @param  string $term Query term to replace and escape
-     * @return string Replaced and escaped query term
      * @link http://lucene.apache.org/java/2_4_0/queryparsersyntax.html#Boolean%20operators
      * @link http://lucene.apache.org/java/2_4_0/queryparsersyntax.html#Escaping%20Special%20Characters
+     *
+     * @param string $term Query term to replace and escape
+     *
+     * @return string Replaced and escaped query term
      */
     public static function replaceBooleanWordsAndEscapeTerm($term)
     {
@@ -34,20 +35,22 @@ public static function replaceBooleanWordsAndEscapeTerm($term)
 
     /**
      * Escapes the following terms (because part of the query language)
-     * + - && || ! ( ) { } [ ] ^ " ~ * ? : \
+     * + - && || ! ( ) { } [ ] ^ " ~ * ? : \ < >.
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_reserved_characters
+     *
+     * @param string $term Query term to escape
      *
-     * @param  string $term Query term to escape
      * @return string Escaped query term
-     * @link http://lucene.apache.org/java/2_4_0/queryparsersyntax.html#Escaping%20Special%20Characters
      */
     public static function escapeTerm($term)
     {
         $result = $term;
         // \ escaping has to be first, otherwise escaped later once again
-        $chars = array('\\', '+', '-', '&&', '||', '!', '(', ')', '{', '}', '[', ']', '^', '"', '~', '*', '?', ':');
+        $chars = array('\\', '+', '-', '&&', '||', '!', '(', ')', '{', '}', '[', ']', '^', '"', '~', '*', '?', ':', '/', '<', '>');
 
         foreach ($chars as $char) {
-            $result = str_replace($char, '\\' . $char, $result);
+            $result = str_replace($char, '\\'.$char, $result);
         }
 
         return $result;
@@ -55,54 +58,59 @@ public static function escapeTerm($term)
 
     /**
      * Replace the following reserved words (because part of the query language)
-     * AND OR NOT
+     * AND OR NOT.
      *
-     * @param  string $term Query term to replace
-     * @return string Replaced query term
      * @link http://lucene.apache.org/java/2_4_0/queryparsersyntax.html#Boolean%20operators
+     *
+     * @param string $term Query term to replace
+     *
+     * @return string Replaced query term
      */
     public static function replaceBooleanWords($term)
     {
-        $replacementMap = array('AND'=>'&&', 'OR'=>'||', 'NOT'=>'!');
+        $replacementMap = array(' AND ' => ' && ', ' OR ' => ' || ', ' NOT ' => ' !');
         $result = strtr($term, $replacementMap);
 
         return $result;
     }
 
     /**
-     * Converts a snake_case string to CamelCase
+     * Converts a snake_case string to CamelCase.
      *
      * For example: hello_world to HelloWorld
      *
-     * @param  string $string snake_case string
+     * @param string $string snake_case string
+     *
      * @return string CamelCase string
      */
     public static function toCamelCase($string)
     {
-        return str_replace(" ", "", ucwords(str_replace("_", " ", $string)));
+        return str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
     }
 
     /**
-     * Converts a CamelCase string to snake_case
+     * Converts a CamelCase string to snake_case.
      *
      * For Example HelloWorld to hello_world
      *
-     * @param  string $string CamelCase String to Convert
+     * @param string $string CamelCase String to Convert
+     *
      * @return string SnakeCase string
      */
     public static function toSnakeCase($string)
     {
         $string = preg_replace('/([A-Z])/', '_$1', $string);
 
-        return strtolower(substr($string,1));
+        return strtolower(substr($string, 1));
     }
 
     /**
-     * Converts given time to format: 1995-12-31T23:59:59Z
+     * Converts given time to format: 1995-12-31T23:59:59Z.
      *
      * This is the lucene date format
      *
-     * @param  int    $date Date input (could be string etc.) -> must be supported by strtotime
+     * @param int $date Date input (could be string etc.) -> must be supported by strtotime
+     *
      * @return string Converted date string
      */
     public static function convertDate($date)
@@ -112,16 +120,35 @@ public static function convertDate($date)
         } else {
             $timestamp = strtotime($date);
         }
-        $string =  date('Y-m-d\TH:i:s\Z', $timestamp);
+        $string = date('Y-m-d\TH:i:s\Z', $timestamp);
+
+        return $string;
+    }
+
+    /**
+     * Convert a \DateTime object to format: 1995-12-31T23:59:59Z+02:00.
+     *
+     * Converts it to the lucene format, including the appropriate TimeZone
+     *
+     * @param \DateTime $dateTime
+     * @param bool      $includeTimezone
+     *
+     * @return string
+     */
+    public static function convertDateTimeObject(\DateTime $dateTime, $includeTimezone = true)
+    {
+        $formatString = 'Y-m-d\TH:i:s'.($includeTimezone === true ? 'P' : '\Z');
+        $string = $dateTime->format($formatString);
 
         return $string;
     }
 
     /**
      * Tries to guess the name of the param, based on its class
-     * Exemple: \Elastica\Filter\HasChildFilter => has_child
+     * Example: \Elastica\Filter\HasChildFilter => has_child.
      *
      * @param string|object Class or Class name
+     *
      * @return string parameter name
      */
     public static function getParamName($class)
@@ -131,36 +158,38 @@ public static function getParamName($class)
         }
 
         $parts = explode('\\', $class);
-        $last  = array_pop($parts);
-        $last  = preg_replace('/(Facet|Query|Filter)$/', '', $last);
-        $name  = self::toSnakeCase($last);
+        $last = array_pop($parts);
+        $last = preg_replace('/(Query|Filter)$/', '', $last);
+        $name = self::toSnakeCase($last);
 
         return $name;
     }
 
     /**
-     * Converts Request to Curl console command
+     * Converts Request to Curl console command.
      *
      * @param Request $request
+     *
      * @return string
      */
     public static function convertRequestToCurlCommand(Request $request)
     {
-        $message = 'curl -X' . strtoupper($request->getMethod()) . ' ';
-        $message .= '\'http://' . $request->getConnection()->getHost() . ':' . $request->getConnection()->getPort() . '/';
+        $message = 'curl -X'.strtoupper($request->getMethod()).' ';
+        $message .= '\'http://'.$request->getConnection()->getHost().':'.$request->getConnection()->getPort().'/';
         $message .= $request->getPath();
 
         $query = $request->getQuery();
         if (!empty($query)) {
-            $message .= '?' . http_build_query($query);
+            $message .= '?'.http_build_query($query);
         }
 
         $message .= '\'';
 
         $data = $request->getData();
         if (!empty($data)) {
-            $message .= ' -d \'' . json_encode($data) . '\'';
+            $message .= ' -d \''.JSON::stringify($data).'\'';
         }
+
         return $message;
     }
 }
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/AbstractLogger.php b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/AbstractLogger.php
new file mode 100755
index 0000000..5a68a23
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/AbstractLogger.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger implementation that other Loggers can inherit from.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+abstract class AbstractLogger implements LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/InvalidArgumentException.php b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/InvalidArgumentException.php
new file mode 100755
index 0000000..67f852d
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Psr\Log;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LogLevel.php b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LogLevel.php
new file mode 100755
index 0000000..9cebcac
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LogLevel.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes log levels.
+ */
+class LogLevel
+{
+    const EMERGENCY = 'emergency';
+    const ALERT     = 'alert';
+    const CRITICAL  = 'critical';
+    const ERROR     = 'error';
+    const WARNING   = 'warning';
+    const NOTICE    = 'notice';
+    const INFO      = 'info';
+    const DEBUG     = 'debug';
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerAwareInterface.php b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerAwareInterface.php
new file mode 100755
index 0000000..e84191b
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerAwareInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger-aware instance.
+ */
+interface LoggerAwareInterface
+{
+    /**
+     * Sets a logger instance on the object.
+     *
+     * @param LoggerInterface $logger
+     *
+     * @return null
+     */
+    public function setLogger(LoggerInterface $logger);
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerAwareTrait.php b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerAwareTrait.php
new file mode 100755
index 0000000..639f79b
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerAwareTrait.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Basic Implementation of LoggerAwareInterface.
+ */
+trait LoggerAwareTrait
+{
+    /**
+     * The logger instance.
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Sets a logger.
+     *
+     * @param LoggerInterface $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerInterface.php b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerInterface.php
new file mode 100755
index 0000000..16c04ad
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerInterface.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger instance.
+ *
+ * The message MUST be a string or object implementing __toString().
+ *
+ * The message MAY contain placeholders in the form: {foo} where foo
+ * will be replaced by the context data in key "foo".
+ *
+ * The context array can contain arbitrary data. The only assumption that
+ * can be made by implementors is that if an Exception instance is given
+ * to produce a stack trace, it MUST be in a key named "exception".
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ * for the full interface specification.
+ */
+interface LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function emergency($message, array $context = array());
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function alert($message, array $context = array());
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function critical($message, array $context = array());
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function error($message, array $context = array());
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function warning($message, array $context = array());
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function notice($message, array $context = array());
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function info($message, array $context = array());
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function debug($message, array $context = array());
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function log($level, $message, array $context = array());
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerTrait.php b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerTrait.php
new file mode 100755
index 0000000..d8c611b
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/LoggerTrait.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger trait that classes unable to extend AbstractLogger
+ * (because they extend another class, etc) can include.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+trait LoggerTrait
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    abstract public function log($level, $message, array $context = array());
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/NullLogger.php b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/NullLogger.php
new file mode 100755
index 0000000..3fc5100
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/NullLogger.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This Logger can be used to avoid conditional log calls.
+ *
+ * Logging should always be optional, and if no logger is provided to your
+ * library creating a NullLogger instance to have something to throw logs at
+ * is a good way to avoid littering your code with `if ($this->logger) { }`
+ * blocks.
+ */
+class NullLogger extends AbstractLogger
+{
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return null
+     */
+    public function log($level, $message, array $context = array())
+    {
+        // noop
+    }
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/Test/LoggerInterfaceTest.php b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/Test/LoggerInterfaceTest.php
new file mode 100755
index 0000000..06f250d
--- /dev/null
+++ b/core/components/simplesearch/model/simplesearch/driver/libs/Psr/Log/Test/LoggerInterfaceTest.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace Psr\Log\Test;
+
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+
+/**
+ * Provides a base test class for ensuring compliance with the LoggerInterface.
+ *
+ * Implementors can extend the class and implement abstract methods to run this
+ * as part of their test suite.
+ */
+abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @return LoggerInterface
+     */
+    abstract public function getLogger();
+
+    /**
+     * This must return the log messages in order.
+     *
+     * The simple formatting of the messages is: "<LOG LEVEL> <MESSAGE>".
+     *
+     * Example ->error('Foo') would yield "error Foo".
+     *
+     * @return string[]
+     */
+    abstract public function getLogs();
+
+    public function testImplements()
+    {
+        $this->assertInstanceOf('Psr\Log\LoggerInterface', $this->getLogger());
+    }
+
+    /**
+     * @dataProvider provideLevelsAndMessages
+     */
+    public function testLogsAtAllLevels($level, $message)
+    {
+        $logger = $this->getLogger();
+        $logger->{$level}($message, array('user' => 'Bob'));
+        $logger->log($level, $message, array('user' => 'Bob'));
+
+        $expected = array(
+            $level.' message of level '.$level.' with context: Bob',
+            $level.' message of level '.$level.' with context: Bob',
+        );
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function provideLevelsAndMessages()
+    {
+        return array(
+            LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
+            LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
+            LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
+            LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
+            LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
+            LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
+            LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
+            LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
+        );
+    }
+
+    /**
+     * @expectedException \Psr\Log\InvalidArgumentException
+     */
+    public function testThrowsOnInvalidLevel()
+    {
+        $logger = $this->getLogger();
+        $logger->log('invalid level', 'Foo');
+    }
+
+    public function testContextReplacement()
+    {
+        $logger = $this->getLogger();
+        $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
+
+        $expected = array('info {Message {nothing} Bob Bar a}');
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testObjectCastToString()
+    {
+        $dummy = $this->getMock('Psr\Log\Test\DummyTest', array('__toString'));
+        $dummy->expects($this->once())
+            ->method('__toString')
+            ->will($this->returnValue('DUMMY'));
+
+        $this->getLogger()->warning($dummy);
+
+        $expected = array('warning DUMMY');
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testContextCanContainAnything()
+    {
+        $context = array(
+            'bool' => true,
+            'null' => null,
+            'string' => 'Foo',
+            'int' => 0,
+            'float' => 0.5,
+            'nested' => array('with object' => new DummyTest),
+            'object' => new \DateTime,
+            'resource' => fopen('php://memory', 'r'),
+        );
+
+        $this->getLogger()->warning('Crazy context data', $context);
+
+        $expected = array('warning Crazy context data');
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
+    {
+        $logger = $this->getLogger();
+        $logger->warning('Random message', array('exception' => 'oops'));
+        $logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+
+        $expected = array(
+            'warning Random message',
+            'critical Uncaught Exception!'
+        );
+        $this->assertEquals($expected, $this->getLogs());
+    }
+}
+
+class DummyTest
+{
+}
diff --git a/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverbasic.class.php b/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverbasic.class.php
index 6b4f7ca..bf085c0 100755
--- a/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverbasic.class.php
+++ b/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverbasic.class.php
@@ -169,24 +169,25 @@ public function search($str,array $scriptProperties = array()) {
                 'terms'=> $relevancyTerms
             ));
     	}
-    	if (!empty($ids)) {
-            $idType = $this->modx->getOption('idType',$this->config,'parents');
-            $depth = $this->modx->getOption('depth',$this->config,10);
-            $ids = $this->processIds($ids,$idType,$depth);
-            if (!empty($exclude)) {
-                $exclude = $this->cleanIds($exclude);
-                $f = $this->modx->getSelectColumns('modResource','modResource','',array('id'));
-                /* no need to build 'NOT IN' array because we will remove these from the 'IN' array */
-                #$c->where(array("{$f}:NOT IN" => explode(',', $exclude)),xPDOQuery::SQL_AND,null,2);
-                $ids = array_diff($ids, explode(',', $exclude));
-            }
-            $f = $this->modx->getSelectColumns('modResource','modResource','',array('id'));
-            $c->where(array("{$f}:IN" => $ids),xPDOQuery::SQL_AND,null,$whereGroup);
-        }
+      if (!empty($ids)) {
+        $idType = $this->modx->getOption('idType',$this->config,'parents');
+        $depth = $this->modx->getOption('depth',$this->config,10);
+        $ids = $this->processIds($ids,$idType,$depth);
+        $f = $this->modx->getSelectColumns('modResource','modResource','',array('id'));
+        $c->where(array("{$f}:IN" => $ids),xPDOQuery::SQL_AND,null,$whereGroup);
+      }
+      if (!empty($exclude)) {
+        $idType = $this->modx->getOption('idType',$this->config,'parents');
+        $depth = $this->modx->getOption('depth',$this->config,10);
+        $exclude = $this->processIds($exclude,$idType,$depth);
+        $f = $this->modx->getSelectColumns('modResource','modResource','',array('id'));
+        $c->where(array("{$f}:NOT IN" => $exclude),xPDOQuery::SQL_AND,null,$whereGroup);
+      }
 
     	$c->where(array('published:=' => 1), xPDOQuery::SQL_AND, null, $whereGroup);
     	$c->where(array('searchable:=' => 1), xPDOQuery::SQL_AND, null, $whereGroup);
-    	$c->where(array('deleted:=' => 0), xPDOQuery::SQL_AND, null, $whereGroup);
+        $c->where(array('deleted:=' => 0), xPDOQuery::SQL_AND, null, $whereGroup);
+        $c->where(array('class_key:!=' => 'modWebLink'), xPDOQuery::SQL_AND, null, $whereGroup);
 
         /* restrict to either this context or specified contexts */
         $ctx = !empty($this->config['contexts']) ? $this->config['contexts'] : $this->modx->context->get('key');
diff --git a/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverelastic.class.php b/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverelastic.class.php
index 98e89da..e28c408 100755
--- a/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverelastic.class.php
+++ b/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverelastic.class.php
@@ -104,7 +104,21 @@ public function search($string,array $scriptProperties = array()) {
         $query->setFields($fields);
         $query->setQuery($string);
 
-        $customFilterScore = new \Elastica\Query\CustomFiltersScore();
+        $queryType = $this->modx->getOption('queryType', $scriptProperties, 'and');
+        switch($queryType) {
+            case 'phrase':
+                $query->setType('phrase');
+            break;
+            case 'and':
+            case 'or' :
+                $query->setOperator($queryType);
+            break;
+            default :
+                $query->setOperator('and');
+            break;
+        }
+
+        $customFilterScore = new \Elastica\Query\FunctionScore();
         $customFilterScore->setQuery($query);
 
         $searchBoosts = $this->modx->getOption('sisea.elastic.search_boost', null, '');
@@ -139,10 +153,10 @@ public function search($string,array $scriptProperties = array()) {
         }
 
         if (empty($boosts)) {
-            $customFilterScore->addFilter(new \Elastica\Filter\Term(array('type' => 'document')), 1);
+            $customFilterScore->addWeightFunction(1, new \Elastica\Filter\Term(array('type' => 'document')));
         } else {
             foreach ($boosts as $boost) {
-                $customFilterScore->addFilter(new \Elastica\Filter\Term(array($boost['field'] => $boost['value'])), $boost['boost']);
+                $customFilterScore->addWeightFunction($boost['boost'], new \Elastica\Filter\Term(array($boost['field'] => $boost['value'])));
             }
         }
 
@@ -161,61 +175,62 @@ public function search($string,array $scriptProperties = array()) {
             $elasticaQuery->setSize($perPage);
     	}
 
-        $elasticaFilterAnd = new \Elastica\Filter\BoolAnd();
+        $elasticaFilterAnd = new \Elastica\Query\BoolQuery();
 
         /* handle hidemenu option */
         $hideMenu = $this->modx->getOption('hideMenu',$scriptProperties,2);
         if ($hideMenu != 2) {
-            $elasticaFilterHideMenu  = new \Elastica\Filter\Term();
+            $elasticaFilterHideMenu  = new \Elastica\Query\Term();
             $elasticaFilterHideMenu->setTerm('hidemenu', ($hideMenu ? 1 : 0));
-            $elasticaFilterAnd->addFilter($elasticaFilterHideMenu);
+            $elasticaFilterAnd->addMust($elasticaFilterHideMenu);
         }
 
         /* handle contexts */
         $contexts = $this->modx->getOption('contexts',$scriptProperties,'');
         $contexts = !empty($contexts) ? $contexts : $this->modx->context->get('key');
         $contexts = explode(',',$contexts);
-        $elasticaFilterContext  = new \Elastica\Filter\Terms();
+        $elasticaFilterContext  = new \Elastica\Query\Terms();
         $elasticaFilterContext->setTerms('context_key', $contexts);
-        $elasticaFilterAnd->addFilter($elasticaFilterContext);
+        $elasticaFilterAnd->addMust($elasticaFilterContext);
 
         /* handle restrict search to these IDs */
         $ids = $this->modx->getOption('ids',$scriptProperties,'');
-    	if (!empty($ids)) {
+    	  if (!empty($ids)) {
             $idType = $this->modx->getOption('idType',$this->config,'parents');
             $depth = $this->modx->getOption('depth',$this->config,10);
             $ids = $this->processIds($ids,$idType,$depth);
-            $elasticaFilterId  = new \Elastica\Filter\Term();
-            $elasticaFilterId->setTerm('id', $ids);
-            $elasticaFilterAnd->addFilter($elasticaFilterId);
 
+            $elasticaFilterId  = new \Elastica\Query\Terms();
+            $elasticaFilterId->setTerms('id', $ids);
+            $elasticaFilterAnd->addMust($elasticaFilterId);
         }
 
         /* handle exclude IDs from search */
         $exclude = $this->modx->getOption('exclude',$scriptProperties,'');
         if (!empty($exclude)) {
-            $exclude = $this->cleanIds($exclude);
-            $exclude = explode(',', $exclude);
-            $elasticaFilterExcludeId  = new \Elastica\Filter\Term();
-            $elasticaFilterExcludeId->setTerm('id', $exclude);
-            $elasticaFilterNotId = new \Elastica\Filter\BoolNot($elasticaFilterExcludeId);
-            $elasticaFilterAnd->addFilter($elasticaFilterNotId);
+            $idType = $this->modx->getOption('idType',$this->config,'parents');
+            $depth = $this->modx->getOption('depth',$this->config,10);
+            $exclude = $this->processIds($exclude,$idType,$depth);
+
+            $elasticaFilterExcludeId  = new \Elastica\Query\Terms();
+            $elasticaFilterExcludeId->setTerms('id', $exclude);
+            $elasticaFilterAnd->addMustNot($elasticaFilterExcludeId);
         }
 
         /* basic always-on conditions */
-        $elasticaFilterPublished  = new \Elastica\Filter\Term();
+        $elasticaFilterPublished  = new \Elastica\Query\Term();
         $elasticaFilterPublished->setTerm('published', 1);
-        $elasticaFilterAnd->addFilter($elasticaFilterPublished);
+        $elasticaFilterAnd->addMust($elasticaFilterPublished);
 
-        $elasticaFilterSearchable  = new \Elastica\Filter\Term();
+        $elasticaFilterSearchable  = new \Elastica\Query\Term();
         $elasticaFilterSearchable->setTerm('searchable', 1);
-        $elasticaFilterAnd->addFilter($elasticaFilterSearchable);
+        $elasticaFilterAnd->addMust($elasticaFilterSearchable);
 
-        $elasticaFilterDeleted  = new \Elastica\Filter\Term();
+        $elasticaFilterDeleted  = new \Elastica\Query\Term();
         $elasticaFilterDeleted->setTerm('deleted', 0);
-        $elasticaFilterAnd->addFilter($elasticaFilterDeleted);
+        $elasticaFilterAnd->addMust($elasticaFilterDeleted);
 
-        $elasticaQuery->setFilter($elasticaFilterAnd);
+        $elasticaQuery->setPostFilter($elasticaFilterAnd);
 
         /* sorting */
         if (!empty($scriptProperties['sortBy'])) {
@@ -290,6 +305,9 @@ public function index(array $fields = array()) {
                 if($fieldName == 'id'){
                     $document->setId($value);
                 }
+                if($fieldName == 'content') {
+                    $value = strip_tags($value, '<p>,<h1>,<h2>,<h3>,<h4>,<em>,<strong>,<br>');
+                }
                 $document->set($fieldName,$value);
             }
         }