diff --git a/README.md b/README.md
index 1bbfbe9..449b9b5 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ Upgrading to 2.0.0 from 1.* is highly recommended, but it does introduce some ri
 
 Important changes from 1.* to 2.0.0:
 - The namespace has been changed from `sisea` to `simplesearch`. If you're using custom System Settings, then please migrate them.
+- The placeholder prefix has also been changed from `sisea` to `simplesearch`.
 - The ElasticSearch and SOLR drivers have been removed, because they were in need of improvements. Future drivers should be seperate addons. Feel free to ask us for help here.
 
 ## Autosuggest
@@ -35,3 +36,8 @@ $('.simplesearch-search-form input[type="text"]').on('keyup', function () {
 
 ## Bugs and feature requests
 We value your feedback, feature requests and bug reports. Please issue them on [Github](https://github.com/Sterc/SimpleSearch/issues/new).
+
+# Free Extra
+This is a free extra and the code is publicly available for you to change. The extra is being actively maintained and you're free to put in pull requests which match our roadmap. Please create an issue if the pull request differs from the roadmap so we can make sure we're on the same page.
+
+Need help? [Approach our support desk for paid premium support.](mailto:service@sterc.com)
diff --git a/_build/config.json b/_build/config.json
index 79827c1..584280a 100644
--- a/_build/config.json
+++ b/_build/config.json
@@ -3,7 +3,7 @@
   "lowCaseName": "simplesearch",
   "description": "A simple search solution for MODX Revolution. Loosely based on AjaxSearch for Evolution (minus the ajax). Only searches Resources; does not search dynamic content.",
   "author": "Sterc",
-  "version": "2.1.0-pl",
+  "version": "2.1.2-pl",
   "package":{
     "elements": {
       "chunks": [{
diff --git a/_packages/simplesearch-2.1.1-pl.transport.zip b/_packages/simplesearch-2.1.1-pl.transport.zip
new file mode 100644
index 0000000..ee9f00f
Binary files /dev/null and b/_packages/simplesearch-2.1.1-pl.transport.zip differ
diff --git a/_packages/simplesearch-2.1.2-pl.transport.zip b/_packages/simplesearch-2.1.2-pl.transport.zip
new file mode 100644
index 0000000..856320e
Binary files /dev/null and b/_packages/simplesearch-2.1.2-pl.transport.zip differ
diff --git a/core/components/simplesearch/docs/changelog.txt b/core/components/simplesearch/docs/changelog.txt
index 9805e2d..b0f69b0 100644
--- a/core/components/simplesearch/docs/changelog.txt
+++ b/core/components/simplesearch/docs/changelog.txt
@@ -1,5 +1,15 @@
 Changelog for SimpleSearch.
 
+SimpleSearch 2.1.2
+========================================================================
+- Show facet results when default has none.
+- Have all placeholders in no result page
+- Fix pagination for pageLimit & facet search
+
+SimpleSearch 2.1.1
+========================================================================
+- Fix includeTVList bug to show normal search results as well.
+
 SimpleSearch 2.1.0
 ========================================================================
 - Added pdoParser support
@@ -52,7 +62,7 @@ SimpleSearch 1.8.0
 - Added support to ElasticSearch driver for using search fields
 - Added support to ElasticSearch driver for boosting results by a field value
 - Updated Elastica to v0.90.7.0
-- Added outputSeparator option 
+- Added outputSeparator option
 
 SimpleSearch 1.7.0
 ========================================================================
diff --git a/core/components/simplesearch/elements/snippets/simplesearch.snippet.php b/core/components/simplesearch/elements/snippets/simplesearch.snippet.php
index 2eaec21..2adccf5 100644
--- a/core/components/simplesearch/elements/snippets/simplesearch.snippet.php
+++ b/core/components/simplesearch/elements/snippets/simplesearch.snippet.php
@@ -7,10 +7,10 @@
  * @package simplesearch
  */
 require_once $modx->getOption(
-        'simplesearch.core_path',
-        null,
-        $modx->getOption('core_path') . 'components/simplesearch/'
-    ) . 'model/simplesearch/simplesearch.class.php';
+    'simplesearch.core_path',
+    null,
+    $modx->getOption('core_path') . 'components/simplesearch/'
+) . 'model/simplesearch/simplesearch.class.php';
 $search = new SimpleSearch($modx, $scriptProperties);
 
 /* Find search index and toplaceholder setting */
@@ -54,12 +54,13 @@
 $offsetIndex       = $modx->getOption('offsetIndex', $scriptProperties, 'simplesearch_offset');
 $idx               = isset($_REQUEST[$offsetIndex]) ? (int) $_REQUEST[$offsetIndex] + 1 : 1;
 $postHooks         = $modx->getOption('postHooks', $scriptProperties, '');
-$activeFacet       = $modx->getOption('facet',$_REQUEST,$modx->getOption('activeFacet', $scriptProperties, 'default'));
+$activeFacet       = $modx->getOption('facet', $_REQUEST, $modx->getOption('activeFacet', $scriptProperties, 'default'));
 $activeFacet       = $modx->sanitizeString($activeFacet);
 $facetLimit        = $modx->getOption('facetLimit', $scriptProperties, 5);
 $outputSeparator   = $modx->getOption('outputSeparator', $scriptProperties, "\n");
 $addSearchToLink   = (int) $modx->getOption('addSearchToLink', $scriptProperties, 0);
 $searchInLinkName  = $modx->getOption('searchInLinkName', $scriptProperties, 'search');
+$noResults = true;
 
 /* Get results */
 $response     = $search->getSearchResults($searchString, $scriptProperties);
@@ -87,7 +88,7 @@
                 $text = $modx->runSnippet($extractSource, $resourceArray);
             }
 
-            $extract = $search->createExtract($text,$extractLength,$extract,$extractEllipsis);
+            $extract = $search->createExtract($text, $extractLength, $extract,$extractEllipsis);
 
             /* Cleanup extract */
             $extract = strip_tags(preg_replace("#\<!--(.*?)--\>#si", '', $extract));
@@ -131,7 +132,7 @@
             foreach ($facetResults['results'] as $r) {
                 $r['idx']                           = $idx;
                 $fTpl                               = !empty($scriptProperties['tpl' . $facetKey]) ? $scriptProperties['tpl' . $facetKey] : $tpl;
-                $resultsTpl[$facetKey]['results'][] = $search->getChunk($fTpl,$r);
+                $resultsTpl[$facetKey]['results'][] = $search->getChunk($fTpl, $r);
                 $idx++;
             }
         }
@@ -141,10 +142,14 @@
 /* Set faceted results to placeholders for easy result positioning. */
 $output = array();
 foreach ($resultsTpl as $facetKey => $facetResults) {
-    $resultSet                          = implode($outputSeparator,$facetResults['results']);
+    $resultSet                          = implode($outputSeparator, $facetResults['results']);
     $placeholders[$facetKey.'.results'] = $resultSet;
     $placeholders[$facetKey.'.total']   = !empty($facetResults['total']) ? $facetResults['total'] : 0;
     $placeholders[$facetKey.'.key']     = $facetKey;
+
+    if ($placeholders[$facetKey.'.total'] !== 0) {
+        $noResults = false;
+    }
 }
 
 $placeholders['results']   = $placeholders[$activeFacet . '.results']; /* Set active facet results. */
@@ -152,7 +157,7 @@
 $placeholders['page']      = isset($_REQUEST[$offsetIndex]) ? ceil((int) $_REQUEST[$offsetIndex] / $perPage) + 1 : 1;
 $placeholders['pageCount'] = !empty($resultsTpl[$activeFacet]['total']) ? ceil($resultsTpl[$activeFacet]['total'] / $perPage) : 1;
 
-if (!empty($response['results'])) {
+if (!empty($placeholders['results'])) {
     /* add results found message */
     $placeholders['resultInfo'] = $modx->lexicon('simplesearch.results_found', array(
         'count' => $placeholders['total'],
@@ -161,7 +166,7 @@
 
     /* If perPage set to >0, add paging */
     if ($perPage > 0) {
-        $placeholders['paging'] = $search->getPagination($searchString,$perPage,$pagingSeparator,$placeholders['total']);
+        $placeholders['paging'] = $search->getPagination($searchString, $perPage, $pagingSeparator, $placeholders['total']);
     }
 }
 
@@ -173,12 +178,10 @@
 $modx->setPlaceholder($placeholderPrefix . 'count', $response['total']);
 $modx->setPlaceholders($placeholders, $placeholderPrefix);
 
-if (empty($response['results'])) {
-    $output = $search->getChunk($noResultsTpl, array(
-        'query' => $searchString,
-    ));
+if ($noResults) {
+    $output = $search->getChunk($noResultsTpl, $placeholders);
 } else {
     $output = $search->getChunk($containerTpl, $placeholders);
 }
 
-return $search->output($output, $toPlaceholder);
\ No newline at end of file
+return $search->output($output, $toPlaceholder);
diff --git a/core/components/simplesearch/model/simplesearch/driver/mysql/simplesearchdriverbasic.class.php b/core/components/simplesearch/model/simplesearch/driver/mysql/simplesearchdriverbasic.class.php
index 60d4ac9..06c9636 100644
--- a/core/components/simplesearch/model/simplesearch/driver/mysql/simplesearchdriverbasic.class.php
+++ b/core/components/simplesearch/model/simplesearch/driver/mysql/simplesearchdriverbasic.class.php
@@ -5,6 +5,5 @@
  *
  * @package simplesearch
  */
-require_once __DIR__ . '/simplesearchdriverbasic.class.php';
-
+require_once strtr(realpath(dirname(__DIR__)), '\\', '/') . '/simplesearchdriverbasic.class.php';
 class SimpleSearchDriverBasic_mysql extends SimpleSearchDriverBasic {}
\ No newline at end of file
diff --git a/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverbasic.class.php b/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverbasic.class.php
index 3e3eb92..bd2caae 100644
--- a/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverbasic.class.php
+++ b/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverbasic.class.php
@@ -44,6 +44,8 @@ public function search($str, array $scriptProperties = []) {
         $docFields     = explode(',', $this->modx->getOption('docFields', $scriptProperties, 'pagetitle,longtitle,alias,description,introtext,content'));
         $includeTVs    = $this->modx->getOption('includeTVs', $scriptProperties, false);
         $includeTVList = $this->modx->getOption('includeTVList', $scriptProperties, '');
+        $includedTVIds = array();
+
 
         $c = $this->modx->newQuery('modResource');
         if ($includeTVs) {
@@ -51,10 +53,16 @@ public function search($str, array $scriptProperties = []) {
             if (!empty($includeTVList)) {
                 $includeTVList = explode(',', $includeTVList);
                 $includeTVList = array_map('trim', $includeTVList);
-                $c->leftJoin('modTemplateVar', 'TemplateVar', array('TemplateVarResources.tmplvarid = TemplateVar.id'));
-                $c->where(array(
-                    'TemplateVar.name:IN' => $includeTVList
-                ));
+                $tv = $this->modx->newQuery('modTemplateVar', [
+                    'name:IN' => $includeTVList
+                ]);
+                $tv->select('id');
+                $tv->prepare();
+                $result = $this->modx->query($tv->toSQL());
+                $tvIds = $result->fetchAll(PDO::FETCH_ASSOC);
+                foreach ($tvIds as $row) {
+                    $includedTVIds[] = $row['id'];
+                }
             }
         }
 
@@ -109,6 +117,9 @@ public function search($str, array $scriptProperties = []) {
 
                     if ($includeTVs) {
                         $whereArray[] = array('TemplateVarResources.value:LIKE', $term, xPDOQuery::SQL_OR, $whereGroup);
+                        if (!empty($includeTVList)) {
+                            $whereArray[] = array('TemplateVarResources.tmplvarid:IN', $includedTVIds, xPDOQuery::SQL_AND, $whereGroup);
+                        }
                     }
 
                     if (is_array($customPackages) && !empty($customPackages)) {
@@ -131,8 +142,12 @@ public function search($str, array $scriptProperties = []) {
                 foreach ($docFields as $field) {
                     $whereArray[] = array($field.':LIKE', $term,xPDOQuery::SQL_OR, $whereGroup);
                 }
-
-                $whereArray[] = array('TemplateVarResources.value:LIKE', $term, xPDOQuery::SQL_OR, $whereGroup);
+                if ($includeTVs) {
+                    $whereArray[] = array('TemplateVarResources.value:LIKE', $term, xPDOQuery::SQL_OR, $whereGroup);
+                    if (!empty($includeTVList)) {
+                        $whereArray[] = array('TemplateVarResources.tmplvarid:IN', $includedTVIds, xPDOQuery::SQL_AND, $whereGroup);
+                    }
+                }
                 if (is_array($customPackages) && !empty($customPackages)) {
                     foreach ($customPackages as $package) {
                         $fields = explode(',', $package[1]);
diff --git a/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverelastic.class.php b/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverelastic.class.php
index 1566acd..8827458 100644
--- a/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverelastic.class.php
+++ b/core/components/simplesearch/model/simplesearch/driver/simplesearchdriverelastic.class.php
@@ -55,35 +55,37 @@ public function initialize()
     protected function defaultSetup()
     {
         return [
-            'number_of_shards' => 5,
-            'number_of_replicas' => 1,
-            'analysis' => array(
-                'analyzer' => array(
-                    'index' => array(
-                        "type" => "custom",
-                        "tokenizer" => "whitespace",
-                        "filter" => array(
-                            "asciifolding",
-                            "lowercase",
-                            "haystack_edgengram"
+            'settings' => array(
+                'number_of_shards' => 5,
+                'number_of_replicas' => 1,
+                'analysis' => array(
+                    'analyzer' => array(
+                        'index' => array(
+                            "type" => "custom",
+                            "tokenizer" => "whitespace",
+                            "filter" => array(
+                                "asciifolding",
+                                "lowercase",
+                                "haystack_edgengram"
+                            )
+                        ),
+                        'default_search' => array(
+                            "type" => "custom",
+                            "tokenizer" => "whitespace",
+                            "filter" => array(
+                                "asciifolding",
+                                "lowercase"
+                            )
                         )
                     ),
-                    'default_search' => array(
-                        "type" => "custom",
-                        "tokenizer" => "whitespace",
-                        "filter" => array(
-                            "asciifolding",
-                            "lowercase"
+                    "filter" => array(
+                        "haystack_ngram" => array(
+                            "type" => "nGram"
+                        ),
+                        "haystack_edgengram" => array(
+                            "type" => "edgeNGram"
                         )
                     )
-                ),
-                "filter" => array(
-                    "haystack_ngram" => array(
-                        "type" => "nGram"
-                    ),
-                    "haystack_edgengram" => array(
-                        "type" => "edgeNGram"
-                    )
                 )
             )
         ];
@@ -108,9 +110,11 @@ public function autoLoad($class)
      * @param array $scriptProperties The scriptProperties array from the SimpleSearch snippet
      * @return array
      */
-    public function search($string, array $scriptProperties = [])
-    {
-        $fields = $this->modx->getOption('simplesearch.elastic.search_fields', null, 'pagetitle^20,introtext^10,alias^5,content^1');
+    public function search($string,array $scriptProperties = array()) {
+        ini_set('display_errors', 1);
+        ini_set('error_reporting', E_ALL);
+
+        $fields = $this->modx->getOption('sisea.elastic.search_fields', null, 'pagetitle^20,introtext^10,alias^5,content^1');
 
         $fields = explode(',', $fields);
         $fields = array_map('trim', $fields);
@@ -121,40 +125,38 @@ public function search($string, array $scriptProperties = [])
             return false;
         }
 
-        /** @var \Elastica\Query\MultiMatch $query */
-        $query = new \Elastica\Query\MultiMatch();
-        $query->setFields($fields);
-        $query->setQuery($string);
+        // $query = $this->getBoolRegexpQuery($string, $fields);
+        $query = $this->getMultiMatchQuery($string, $fields);
+
+
+        $customFilterScore = new \Elastica\Query\FunctionScore();
+        $customFilterScore->setQuery($query);
 
-        $functionScore = new \Elastica\Query\FunctionScore();
-        $functionScore->setQuery($query);
 
-        $searchBoosts = $this->modx->getOption('simplesearch.elastic.search_boost', null, '');
+        $searchBoosts = $this->modx->getOption('sisea.elastic.search_boost', null, '');
         $searchBoosts = explode('|', $searchBoosts);
         $searchBoosts = array_map('trim', $searchBoosts);
         $searchBoosts = array_keys(array_flip($searchBoosts));
         $searchBoosts = array_filter($searchBoosts);
 
-        $boosts = [];
+        $boosts = array();
+
+
         foreach ($searchBoosts as $boost) {
-            $arr = ['field' => '', 'value' => '', 'boost' => 1.0];
+            $arr = array('field' => '', 'value' => '', 'boost' => 1.0);
             $field = explode('=', $boost);
             $field = array_map('trim', $field);
             $field = array_keys(array_flip($field));
             $field = array_filter($field);
 
-            if (count($field) !== 2) {
-                continue;
-            }
+            if (count($field) != 2) continue;
 
             $value = explode('^', $field[1]);
             $value = array_map('trim', $value);
             $value = array_keys(array_flip($value));
             $value = array_filter($value);
 
-            if (count($value) !== 2) {
-                continue;
-            }
+            if (count($value) != 2) continue;
 
             $arr['field'] = $field[0];
             $arr['value'] = $value[0];
@@ -163,137 +165,134 @@ public function search($string, array $scriptProperties = [])
             $boosts[] = $arr;
         }
 
-
-        if (!empty($boosts)) {
-            $weightQuery = new \Elastica\Query\AbstractQuery;
+        if (empty($boosts)) {
+             $customFilterScore->addWeightFunction(1, new \Elastica\Query\Term(array('type' => 'document')));
+        } else {
             foreach ($boosts as $boost) {
-                $functionScore->addWeightFunction($boost['boost'], $weightQuery->addParam($arr['field'], $arr['value']));
+                $customFilterScore->addWeightFunction($boost['boost'], new \Elastica\Filter\Query(array($boost['field'] => $boost['value'])));
             }
         }
 
+
         /** @var \Elastica\Query $elasticaQuery */
         $elasticaQuery = new \Elastica\Query();
-        $elasticaQuery->setQuery($functionScore);
-
-        /* Set limit. */
-        $perPage = $this->modx->getOption('perPage', $scriptProperties, 10);
-        if (!empty($perPage)) {
-            $offset      = $this->modx->getOption('start', $scriptProperties, 0);
-            $offsetIndex = $this->modx->getOption('offsetIndex', $scriptProperties, 'simplesearch_offset');
-
-            if (isset($_REQUEST[$offsetIndex])) {
-                $offset = (int)$_REQUEST[$offsetIndex];
-            }
-
+        $elasticaQuery->setQuery($customFilterScore);
+
+    	/* set limit */
+        $perPage = $this->modx->getOption('perPage',$scriptProperties,10);
+    	if (!empty($perPage)) {
+            $offset = $this->modx->getOption('start',$scriptProperties,0);
+            $offsetIndex = $this->modx->getOption('offsetIndex',$scriptProperties,'sisea_offset');
+            if (isset($_REQUEST[$offsetIndex])) $offset = (int)$_REQUEST[$offsetIndex];
             $elasticaQuery->setFrom($offset);
             $elasticaQuery->setSize($perPage);
-        }
+    	}
 
         $elasticaFilterAnd = new \Elastica\Query\BoolQuery();
 
-        /* Handle hidemenu option. */
-        $hideMenu = (int) $this->modx->getOption('hideMenu', $scriptProperties, 2);
-        if ($hideMenu !== 2) {
+        /* handle hidemenu option */
+        $hideMenu = $this->modx->getOption('hideMenu',$scriptProperties,2);
+        if ($hideMenu != 2) {
             $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, '');
+        /* handle contexts */
+        $contexts = $this->modx->getOption('contexts',$scriptProperties,'');
         $contexts = !empty($contexts) ? $contexts : $this->modx->context->get('key');
-        $contexts = explode(',', $contexts);
-
+        $contexts = explode(',',$contexts);
         $elasticaFilterContext  = new \Elastica\Query\Terms();
         $elasticaFilterContext->setTerms('context_key', $contexts);
-        $elasticaFilterAnd->addFilter($elasticaFilterContext);
-
-        /* Handle restrict search to these IDs. */
-        $ids = $this->modx->getOption('ids', $scriptProperties, '');
-        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\Query\Term();
-            $elasticaFilterId->setTerm('id', $ids);
-            $elasticaFilterAnd->addFilter($elasticaFilterId);
+        $elasticaFilterAnd->addMust($elasticaFilterContext);
+
+        /* handle restrict search to these IDs */
+        $ids = $this->modx->getOption('ids',$scriptProperties,'');
+    	  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\Query\Terms();
+            $elasticaFilterId->setTerms('id', $ids);
+            $elasticaFilterAnd->addMust($elasticaFilterId);
         }
 
-        /* Handle exclude IDs from search */
-        $exclude = $this->modx->getOption('exclude', $scriptProperties, '');
+        /* handle exclude IDs from search */
+        $exclude = $this->modx->getOption('exclude',$scriptProperties,'');
         if (!empty($exclude)) {
-            $exclude                 = $this->cleanIds($exclude);
-            $exclude                 = explode(',', $exclude);
-            $elasticaFilterExcludeId = new \Elastica\Query\Term();
+            $idType = $this->modx->getOption('idType',$this->config,'parents');
+            $depth = $this->modx->getOption('depth',$this->config,10);
+            $exclude = $this->processIds($exclude,$idType,$depth);
 
-            $elasticaFilterExcludeId->setTerm('id', $exclude);
-
-            $elasticaFilterNotId = new \Elastica\Filter\BoolNot($elasticaFilterExcludeId);
-            $elasticaFilterAnd->addFilter($elasticaFilterNotId);
+            $elasticaFilterExcludeId  = new \Elastica\Query\Terms();
+            $elasticaFilterExcludeId->setTerms('id', $exclude);
+            $elasticaFilterAnd->addMustNot($elasticaFilterExcludeId);
         }
 
-        /* Basic always-on conditions. */
-        $elasticaFilterPublished = new \Elastica\Query\Term();
-        $elasticaFilterPublished->setTerm('published', 1);
-        $elasticaFilterAnd->addFilter($elasticaFilterPublished);
+        /* basic always-on conditions */
+        $elasticaFilterPublished  = new \Elastica\Query\Term();
+        $elasticaFilterPublished->setTerm('published', true);
+        $elasticaFilterAnd->addMust($elasticaFilterPublished);
 
-        $elasticaFilterSearchable = new \Elastica\Query\Term();
-        $elasticaFilterSearchable->setTerm('searchable', 1);
-        $elasticaFilterAnd->addFilter($elasticaFilterSearchable);
+        $elasticaFilterSearchable  = new \Elastica\Query\Term();
+        $elasticaFilterSearchable->setTerm('searchable', true);
+        $elasticaFilterAnd->addMust($elasticaFilterSearchable);
 
-        $elasticaFilterDeleted = new \Elastica\Query\Term();
-        $elasticaFilterDeleted->setTerm('deleted', 0);
-        $elasticaFilterAnd->addFilter($elasticaFilterDeleted);
+        $elasticaFilterDeleted  = new \Elastica\Query\Term();
+        $elasticaFilterDeleted->setTerm('deleted', false);
+        $elasticaFilterAnd->addMust($elasticaFilterDeleted);
 
         $elasticaQuery->setPostFilter($elasticaFilterAnd);
 
-        /* Sorting. */
+        /* sorting */
         if (!empty($scriptProperties['sortBy'])) {
-            $sortDir       = $this->modx->getOption('sortDir', $scriptProperties, 'desc');
-            $sortDirs      = explode(',', $sortDir);
-            $sortBys       = explode(',', $scriptProperties['sortBy']);
-            $dir           = 'desc';
-            $amountSortBys = count($sortBys);
-
-            $sortArray = [];
-            for ($i = 0; $i < $amountSortBys; $i++) {
+            $sortDir = $this->modx->getOption('sortDir',$scriptProperties,'desc');
+            $sortDirs = explode(',',$sortDir);
+            $sortBys = explode(',',$scriptProperties['sortBy']);
+            $dir = 'desc';
+            $sortArray = array();
+            for ($i=0;$i<count($sortBys);$i++) {
                 if (isset($sortDirs[$i])) {
-                    $dir = $sortDirs[$i];
+                    $dir= $sortDirs[$i];
                 }
+                $sortArray[] = array($sortBys[$i] => $dir);
 
-                $sortArray[] = [$sortBys[$i] => $dir];
             }
-
-            $elasticaQuery->setSort($sortArray);
+            //$elasticaQuery->setSort($sortArray);
+            $elasticaQuery->addSort(
+                ['publishedon' => 'desc']
+            );
         }
 
-        /* Prepare response array. */
-        $response = [
-            'total'      => 0,
-            'start'      => !empty($offset) ? $offset : 0,
-            'limit'      => $perPage,
-            'status'     => 0,
+
+        /* prepare response array */
+        $response = array(
+            'total' => 0,
+            'start' => !empty($offset) ? $offset : 0,
+            'limit' => $perPage,
+            'status' => 0,
             'query_time' => 0,
-            'results'    => [],
-        ];
-        $elasticaResultSet = $this->index->search($query);
+            'results' => array(),
+        );
 
-        $elasticaResults = $elasticaResultSet->getResults();
-        $totalResults    = $elasticaResultSet->getTotalHits();
+        $elasticaResultSet = $this->index->search($elasticaQuery);
+
+        $elasticaResults  = $elasticaResultSet->getResults();
+        $totalResults         = $elasticaResultSet->getTotalHits();
 
         if ($totalResults > 0) {
-            $response['total']      = $totalResults;
+            $response['total'] = $totalResults;
             $response['query_time'] = $elasticaResultSet->getTotalTime();
-            $response['status']     = 1;
-            $response['results']    = [];
+            $response['status'] = 1;
+            $response['results'] = array();
             foreach ($elasticaResults as $doc) {
-                $document = $doc->getData();
+                $d = $doc->getData();
 
                 /** @var modResource $resource */
-                $resource = $this->modx->newObject($document['class_key']);
+                $resource = $this->modx->newObject($d['class_key']);
                 if ($resource->checkPolicy('list')) {
-                    $response['results'][] = $document;
+                    $response['results'][] = $d;
                 }
             }
         }
@@ -372,4 +371,23 @@ public function removeIndex($id)
 
         $type->getIndex()->refresh();
     }
+
+    /**
+     * It's multi match query realisations
+     * @author Robert Kuznetsov <robertkuznetsou@gmail.com>
+     * @param $string
+     * @param $fields
+     * @return \Elastica\Query\MultiMatch $query
+     */
+    private function getMultiMatchQuery($string, $fields) {
+        /** @var \Elastica\Query\MultiMatch $query */
+        $query = new \Elastica\Query\MultiMatch();
+        $query->setFields($fields);
+
+        $query->setQuery($string);
+        $query->setType('phrase');
+        $query->setOperator('and');
+
+        return $query;
+    }
 }
diff --git a/core/components/simplesearch/model/simplesearch/simplesearch.class.php b/core/components/simplesearch/model/simplesearch/simplesearch.class.php
index 32f341c..0e99a46 100644
--- a/core/components/simplesearch/model/simplesearch/simplesearch.class.php
+++ b/core/components/simplesearch/model/simplesearch/simplesearch.class.php
@@ -183,8 +183,6 @@ public function getSearchResults($str = '', array $scriptProperties = [])
         }
 
         $this->loadDriver($scriptProperties);
-//        var_dump($this->driver->search($str, $scriptProperties));
-//        exit;
         $this->response           = $this->driver->search($str, $scriptProperties);
         $this->searchResultsCount = $this->response['total'];
         $this->docs               = $this->response['results'];
@@ -237,7 +235,7 @@ public function getPagination($searchString = '', $perPage = 10, $separator = '
             $pageArray['offset']    = $i * $perPage;
 
             $currentOffset = intval($this->modx->getOption($searchOffset,$_GET,0));
-            if ($pageLimit > 0 && $i + 1 === 1 && $pageArray['offset'] !== $currentOffset && !empty($pageFirstTpl)) {
+            if (!empty($pageFirstTpl) && $pageLimit > 0 && $i + 1 === 1 && (int)$pageArray['offset'] !== $currentOffset) {
                 $parameters = $this->modx->request->getParameters();
                 $parameters = array_merge(
                     $parameters,
@@ -267,14 +265,14 @@ public function getPagination($searchString = '', $perPage = 10, $separator = '
                     $pagination .= $this->getChunk($pagePrevTpl,$pageArray);
                 }
             }
-            if (empty($pageLimit) || ($pageArray['offset'] >= $currentOffset - ($pageLimit * $perPage) && $pageArray['offset'] <= $currentOffset + ($pageLimit * $perPage))) {
+            if (empty($pageLimit) || ((int)$pageArray['offset'] >= $currentOffset - ($pageLimit * $perPage) && (int)$pageArray['offset'] <= $currentOffset + ($pageLimit * $perPage))) {
                 if ($currentOffset === $pageArray['offset']) {
                     $pageArray['text'] = $i + 1;
                     $pageArray['link'] = $i + 1;
 
                     $pagination .= $this->getChunk($currentPageTpl,$pageArray);
                 } else {
-                    $parameters = [];
+                    $parameters = $this->modx->request->getParameters();
                     $parameters = array_merge(
                         $parameters,
                         array(
@@ -288,7 +286,7 @@ public function getPagination($searchString = '', $perPage = 10, $separator = '
                     $pagination .= $this->getChunk($pageTpl,$pageArray);
                 }
             }
-            if ($pageLimit > 0 && $i + 1 === $pageLinkCount && $pageArray['offset'] !== $currentOffset && !empty($pageLastTpl)) {
+            if (!empty($pageLastTpl) && $pageLimit > 0 && $i + 1 === (int)$pageLinkCount && (int)$pageArray['offset'] !== $currentOffset) {
                 if (!empty($pageNextTpl) && ($currentOffset + $perPage) <= $total) {
                     $parameters = $this->modx->request->getParameters();
                     $parameters = array_merge(
@@ -351,9 +349,10 @@ public function sanitize($text)
      * @param string $ellipsis The ellipsis to use to wrap around the extract.
      * @return string The generated extract.
      */
+
     public function createExtract($text, $length = 200, $search = '', $ellipsis = '...')
     {
-        $text = trim(preg_replace('/\s+/', ' ', $this->sanitize($text)));
+        $text = trim(preg_replace('/\s+/u', ' ', $this->sanitize($text)));
         if (empty($text)) {
             return '';
         }
@@ -566,7 +565,7 @@ public function prepareResourceForIndex(array $resourceArray = [])
      */
     public function indexAllResources($scriptProperties)
     {
-        $search = $this->loadDriver($scriptProperties);
+        $this->loadDriver($scriptProperties);
 
         $includeTVs = $this->modx->getOption('includeTVs', $scriptProperties, true);
         $processTVs = $this->modx->getOption('processTVs', $scriptProperties, true);
@@ -592,7 +591,7 @@ public function indexAllResources($scriptProperties)
                 }
             }
 
-            if ($search->driver->index($resourceArray, false)) {
+            if ($this->driver->index($resourceArray, false)) {
                 $this->modx->log(modX::LOG_LEVEL_INFO, '[SimpleSearch] Indexing Resource: ' . $resourceArray['pagetitle']);
                 $total++;
             }