diff --git a/.htaccess b/.htaccess
index 0989a50..bb5adae 100755
--- a/.htaccess
+++ b/.htaccess
@@ -144,12 +144,7 @@ AddDefaultCharset utf-8
     RewriteRule (.*) http://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
 
     RewriteCond %{THE_REQUEST} \s/+(.+?)/+[?\s]
-    RewriteRule /$ /%1 [R,L]
-
-
-
-    RewriteCond %{THE_REQUEST} \s/+(.+?)/+[?\s]
-    RewriteRule /$ /%1 [R,L]
+    RewriteRule /$ /%1 [R=301,L]
 
 
       RewriteCond %{HTTP_HOST} ^([^www].*)$
diff --git a/common/models/FilterCache.php b/common/models/FilterCache.php
new file mode 100644
index 0000000..81ee210
--- /dev/null
+++ b/common/models/FilterCache.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\helpers\ArrayHelper;
+
+/**
+ * This is the model class for table "filter_cache".
+ *
+ * @property integer $id
+ * @property integer $options_key
+ * @property integer $category_id
+ * @property integer $depth
+ * @property integer $count
+ */
+class FilterCache extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'filter_cache';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [[ 'category_id', 'depth', 'count'], 'integer'],
+            [['options_key'], 'string']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'options_key' => 'Options Key',
+            'category_id' => 'Category ID',
+            'depth' => 'Depth',
+            'count' => 'Count',
+        ];
+    }
+
+    /**
+     * @param array $optionsIdArray
+     * @return string
+     */
+    static function createCacheKey($optionsIdArray){
+        if(!empty($optionsIdArray)){
+            sort($optionsIdArray);
+            $string = implode('',$optionsIdArray);
+            $key = md5($string);
+            return $key;
+        } else {
+            return 0;
+        }
+    }
+
+
+    /**
+     * @param $groups
+     * @param $params
+     * @return array
+     */
+
+    static function convertAliasToId($groups,$params){
+        $optionsAlias = ArrayHelper::index($groups,  'option_alias');
+        $convertedParams = [];
+        foreach($params as $key => $options){
+            foreach($options as $option){
+                if(isset($optionsAlias[$option]) && !in_array($optionsAlias[$option]['tax_option_id'],$convertedParams)){
+                    $convertedParams[] =  $optionsAlias[$option]['tax_option_id'];
+                }
+            }
+        }
+        return  $convertedParams;
+
+    }
+
+}
diff --git a/common/modules/product/helpers/FilterHelper.php b/common/modules/product/helpers/FilterHelper.php
index 9f4a573..ff8e734 100755
--- a/common/modules/product/helpers/FilterHelper.php
+++ b/common/modules/product/helpers/FilterHelper.php
@@ -3,10 +3,16 @@
 namespace common\modules\product\helpers;
 
 
+use common\modules\product\models\Brand;
+use common\modules\product\models\Category;
+use common\modules\product\models\Product;
+use common\modules\product\models\ProductVariant;
 use common\modules\rubrication\models\TaxGroup;
 use yii\base\Object;
 use Yii;
+use yii\db\Query;
 use yii\db\QueryInterface;
+use yii\db\ActiveQuery;
 use yii\helpers\ArrayHelper;
 
 class FilterHelper extends Object {
@@ -24,7 +30,7 @@ class FilterHelper extends Object {
 
     }
 
-    /*
+    /**
      * Return custom filter-option link
      * @var array $filter
      * @var array $options
@@ -84,4 +90,157 @@ class FilterHelper extends Object {
 
 
 
+    /**
+     * @param ActiveQuery $query
+     * @param array       $params
+     */
+    public static function setNewQueryParams($query, $params)
+    {
+        $last_query = null;
+        foreach ($params as $key => $param) {
+            switch ($key) {
+                case 'special':
+                    self::filterSpecial($param, $query);
+                    break;
+                case 'brands':
+                    self::filterBrands($param, $query);
+                    break;
+                case 'keywords':
+                    self::filterKeywords($param, $query);
+                    break;
+                case 'prices':
+                    self::filterPrices($param, $query);
+                    break;
+                default:
+                    $last_query = self::filterOptions($param, $last_query);
+                    break;
+            }
+        }
+        if(!empty($last_query)) {
+            $query->andWhere(['product.product_id' => $last_query]);
+        }
+    }
+
+    private static function filterOptions(array $params, Query $last_query = null)
+    {
+        $variant_query = ( new Query() )->distinct()
+            ->select('product_variant.product_id as products')
+            ->from('product_variant_option')
+            ->innerJoin(
+                'product_variant',
+                'product_variant_option.product_variant_id = product_variant.product_variant_id'
+            )
+            ->innerJoin('tax_option', 'tax_option.tax_option_id = product_variant_option.option_id')
+            ->where([ 'tax_option.alias' => $params ]);
+        $product_query = ( new Query() )->distinct()
+            ->select('product_option.product_id as products')
+            ->from('product_option')
+            ->innerJoin('tax_option', 'product_option.option_id = tax_option.tax_option_id')
+            ->where(
+                [ 'tax_option.alias' => $params ]
+            )->union($variant_query);
+        $query = (new Query())->select('products')->from(['result_table' => $product_query]);
+        if (!empty( $last_query )) {
+            $query->andWhere([ 'product.product_id' => $last_query ]);
+        }
+        return $query;
+    }
+
+    private static function filterSpecial(array $params, ActiveQuery $query)
+    {
+        $conditions = [];
+        /**
+         * @var string $key
+         */
+        foreach ($params as $key => $param) {
+            $conditions[] = [
+                '=',
+                Product::tableName() . '.' . $key,
+                $param,
+            ];
+        }
+        /* If 2 or more special conditions get all that satisfy at least one of them. */
+        if (count($conditions) > 1) {
+            array_unshift($conditions, 'or');
+        } else {
+            $conditions = $conditions[ 0 ];
+        }
+        $query->andFilterWhere($conditions);
+    }
+
+    private static function filterBrands(array $param, ActiveQuery $query)
+    {
+        $query->andFilterWhere([ Product::tableName() . '.brand_id' => $param ]);
+    }
+
+    private static function filterKeywords(array $params, ActiveQuery $query)
+    {
+        $conditions = [];
+        if (!empty( $params )) {
+            if (!is_array($params)) {
+                $params = [ $params ];
+            }
+            /**
+             * @var string $param Inputed keyword
+             */
+            foreach ($params as $param) {
+                $conditions[] = [
+                    'or',
+                    [
+                        'ilike',
+                        Product::tableName() . '.name',
+                        $param,
+                    ],
+                    [
+                        'ilike',
+                        Brand::tableName() . '.name',
+                        $param,
+                    ],
+                    [
+                        'ilike',
+                        Category::tableName() . '.name',
+                        $param,
+                    ],
+                    [
+                        'ilike',
+                        ProductVariant::tableName() . '.sku',
+                        $param,
+                    ],
+                ];
+            }
+        }
+        if (count($conditions) > 1) {
+            array_unshift($conditions, 'or');
+        } else {
+            $conditions = $conditions[ 0 ];
+        }
+        $query->andFilterWhere($conditions);
+    }
+
+    private static function filterPrices(array $params, ActiveQuery $query)
+    {
+        $conditions = [];
+        if (!empty( $params[ 'min' ] ) && $params[ 'min' ] > 0) {
+            $conditions[] = [
+                '>=',
+                ProductVariant::tableName() . '.price',
+                $params[ 'min' ],
+            ];
+        }
+        if (!empty( $params[ 'max' ] ) && $params[ 'max' ] > 0) {
+            $conditions[] = [
+                '<=',
+                ProductVariant::tableName() . '.price',
+                $params[ 'max' ],
+            ];
+        }
+        if (count($conditions) > 1) {
+            array_unshift($conditions, 'and');
+        } else {
+            $conditions = $conditions[ 0 ];
+        }
+        $query->andFilterWhere($conditions);
+    }
+
+
 }
\ No newline at end of file
diff --git a/common/modules/product/helpers/ProductHelper.php b/common/modules/product/helpers/ProductHelper.php
index 97ebc85..1935100 100755
--- a/common/modules/product/helpers/ProductHelper.php
+++ b/common/modules/product/helpers/ProductHelper.php
@@ -31,7 +31,7 @@
             return Brand::find(); // ->with('brandName')
         }
         
-        /*
+        /**
          * Return custom filter-option link
          * @var array $filter
          * @var array $options
@@ -269,7 +269,49 @@
             }
             
         }
-        
+
+        /**
+         * @param ActiveQuery $query
+         * @param             $params
+         * @param bool        $setPriceLimits
+         */
+        public static function setCacheQueryParams(&$query, $params)
+        {
+
+
+            foreach($params as $key => $param) {
+
+
+                    $query->andWhere(
+                        Product::tableName() . '.product_id IN (
+                    SELECT DISTINCT products
+                    FROM (
+                        SELECT product_id AS products FROM product WHERE product_id IN(
+                        SELECT product_id FROM  product_option
+                            INNER JOIN tax_option ON tax_option.tax_option_id = product_option.option_id
+                            INNER JOIN tax_group ON tax_group.tax_group_id = tax_option.tax_group_id
+                        WHERE tax_group.alias = \''. $key .'\' AND tax_option.alias IN (\'' . implode('\',\'', $param) . '\'))
+                         OR product_id IN (
+                          (SELECT product_id AS products
+                        FROM product_variant_option
+                            INNER JOIN product_variant ON product_variant_option.product_variant_id = product_variant.product_variant_id
+                            INNER JOIN tax_option ON tax_option.tax_option_id = product_variant_option.option_id
+                            INNER JOIN tax_group ON tax_group.tax_group_id = tax_option.tax_group_id
+                 WHERE tax_group.alias = \''. $key .'\' AND tax_option.alias IN (\'' . implode('\',\'', $param) . '\'))
+                        )
+                        ) AS table_name
+                    )'
+                    );
+            }
+
+
+        }
+
+
+
+
+
+
         public static function productCountQuery($category = NULL, $params, $excludeKeys = [ ])
         {
             $p = [ ];
diff --git a/common/modules/product/models/Category.php b/common/modules/product/models/Category.php
index 9cff907..0c9870a 100755
--- a/common/modules/product/models/Category.php
+++ b/common/modules/product/models/Category.php
@@ -5,7 +5,8 @@ namespace common\modules\product\models;
 
 use common\components\artboxtree\ArtboxTreeBehavior;
 use common\components\artboxtree\ArtboxTreeHelper;
-
+use common\modules\rubrication\models\TaxOption;
+use yii\db\ActiveQuery;
 use common\modules\rubrication\models\TaxGroup;
 use Yii;
 
@@ -35,6 +36,7 @@ use common\behaviors\Slug;
  * @property ProductUnit $productUnit
  * @property CategoryName[] $categoryNames
  * @property ProductCategory[] $productCategories
+ * @property TaxGroup $TaxGroup
  */
 class Category extends \yii\db\ActiveRecord
 {
@@ -195,56 +197,99 @@ class Category extends \yii\db\ActiveRecord
         ProductCategory::deleteAll(['category_id' => $this->category_id]);
         return true;
     }
+
+    /**
+     * @param array $product_id
+     * @param array $product_variant_id
+     * @return  ActiveQuery
+     */
+
+    public function getFilterQuery( $product_id = [], $product_variant_id = []){
+        $query1 = (new Query())
+            ->distinct()
+            ->select([
+                'option_id'
+            ])
+            ->from('tax_option')
+            ->innerJoin('product_variant_option', 'tax_option.tax_option_id = product_variant_option.option_id')
+            ->innerJoin('tax_group', 'tax_group.tax_group_id = tax_option.tax_group_id')
+            ->innerJoin('product_variant', 'product_variant.product_variant_id = product_variant_option.product_variant_id')
+            ->innerJoin('product', 'product.product_id = product_variant.product_id')
+            ->innerJoin('product_category', 'product_category.product_id = product.product_id')
+            ->innerJoin('tax_group_to_category', 'tax_group.tax_group_id = tax_group_to_category.tax_group_id')
+            ->where(['product_category.category_id' => $this->category_id,
+                'tax_group.is_filter' => TRUE,
+                'tax_group_to_category.category_id'=>$this->category_id,
+
+            ])
+            ->filterWhere([
+                'product_variant_option.product_variant_id' => $product_variant_id
+            ])
+            ->andWhere(['!=', 'product_variant.status', 1]);
+
+        $query2 = (new Query())
+            ->distinct()
+            ->select([
+                'option_id'
+            ])
+            ->from('tax_option')
+            ->innerJoin('product_option', 'tax_option.tax_option_id = product_option.option_id')
+            ->innerJoin('tax_group', 'tax_group.tax_group_id = tax_option.tax_group_id')
+            ->innerJoin('product', 'product.product_id = product_option.product_id')
+            ->innerJoin('product_category', 'product_category.product_id = product.product_id')
+            ->innerJoin('product_variant', 'product_variant.product_id = product.product_id')
+            ->innerJoin('tax_group_to_category', 'tax_group.tax_group_id = tax_group_to_category.tax_group_id')
+            ->where(['product_category.category_id' => $this->category_id,
+                'tax_group.is_filter' => TRUE,
+                'tax_group_to_category.category_id'=>$this->category_id,
+            ])
+            ->filterWhere([
+                'product_option.product_id' => $product_id
+            ])
+            ->andWhere(['!=', 'product_variant.status', 1]);
+        $query3 = (new Query())
+            ->select([
+                'tax_option.*',
+                'tax_group.*',
+                'tax_option.alias as option_alias',
+                'tax_group.alias as group_alias',
+                'tax_option.name as value',
+                'tax_option.sort AS tax_option_sort',
+                'tax_group.sort AS tax_group_sort',
+            ])
+            ->from(['tax_option' ])
+            ->where(['tax_option.tax_option_id'=>$query1->union($query2)])
+
+            ->innerJoin('tax_group','tax_group.tax_group_id = tax_option.tax_group_id')
+            ->orderBy('tax_option.sort, tax_group.sort');
+        return $query3;
+    }
+
+    /**
+     * @return mixed
+     * @throws \Exception
+     */
+
+
     public function getActiveFilters() {
         return Category::getDb()->cache(function(){
-            $query1 = (new Query())
-                ->distinct()
-                ->select([
-                    'option_id'
-                ])
-                ->from('tax_option')
-                ->innerJoin('product_variant_option', 'tax_option.tax_option_id = product_variant_option.option_id')
-                ->innerJoin('tax_group', 'tax_group.tax_group_id = tax_option.tax_group_id')
-                ->innerJoin('product_variant', 'product_variant.product_variant_id = product_variant_option.product_variant_id')
-                ->innerJoin('product', 'product.product_id = product_variant.product_id')
-                ->innerJoin('product_category', 'product_category.product_id = product.product_id')
-                ->innerJoin('tax_group_to_category', 'tax_group.tax_group_id = tax_group_to_category.tax_group_id')
-                ->where(['product_category.category_id' => $this->category_id, 'tax_group.is_filter' => TRUE,'tax_group_to_category.category_id'=>$this->category_id])
-                ->andWhere(['!=', 'product_variant.status', 1]);
-
-            $query2 = (new Query())
-                ->distinct()
-                ->select([
-                    'option_id'
-                ])
-                ->from('tax_option')
-                ->innerJoin('product_option', 'tax_option.tax_option_id = product_option.option_id')
-                ->innerJoin('tax_group', 'tax_group.tax_group_id = tax_option.tax_group_id')
-                ->innerJoin('product', 'product.product_id = product_option.product_id')
-                ->innerJoin('product_category', 'product_category.product_id = product.product_id')
-                ->innerJoin('product_variant', 'product_variant.product_id = product.product_id')
-                ->innerJoin('tax_group_to_category', 'tax_group.tax_group_id = tax_group_to_category.tax_group_id')
-                ->where(['product_category.category_id' => $this->category_id, 'tax_group.is_filter' => TRUE,'tax_group_to_category.category_id'=>$this->category_id])
-                ->andWhere(['!=', 'product_variant.status', 1]);
-            $query3 = (new Query())
-                ->select([
-                    'tax_option.*',
-                    'tax_group.*',
-                    'tax_option.alias as option_alias',
-                    'tax_group.alias as group_alias',
-                    'tax_option.name as value',
-                    'tax_option.sort AS tax_option_sort',
-                    'tax_group.sort AS tax_group_sort',
-                ])
-                ->from(['tax_option' ])
-                ->where(['tax_option.tax_option_id'=>$query1->union($query2)])
-                ->innerJoin('tax_group','tax_group.tax_group_id = tax_option.tax_group_id')
-                ->orderBy('tax_option.sort, tax_group.sort');
-            return $query3->all();
+            return $this->getFilterQuery()->all();
         }, 3600);
 
     }
 
+    /**
+     * @param array $product_id
+     * @param array $product_variant_id
+     * @return mixed
+     */
+    public function getSelectFilters($product_id = [], $product_variant_id = []) {
+
+        return $this->getFilterQuery($product_id, $product_variant_id)->select('tax_option_id')->column();
+
+    }
+
+
     public function getTaxGroupsForMenu()
     {
 
@@ -282,4 +327,5 @@ class Category extends \yii\db\ActiveRecord
         return $this->hasMany(TaxGroup::className(), ['tax_group_id' => 'tax_group_id'])
             ->viaTable('tax_group_to_category', ['category_id' => 'category_id']);
     }
+
 }
diff --git a/common/modules/product/models/Product.php b/common/modules/product/models/Product.php
index a97dd22..57b69c9 100755
--- a/common/modules/product/models/Product.php
+++ b/common/modules/product/models/Product.php
@@ -504,4 +504,5 @@ class Product extends \yii\db\ActiveRecord
             ->viaTable('product_option',[ 'product_id'=> 'product_id'])
             ->joinWith('taxGroup');
     }
+
 }
diff --git a/common/modules/product/models/ProductVariant.php b/common/modules/product/models/ProductVariant.php
index 4090e14..1bc052d 100755
--- a/common/modules/product/models/ProductVariant.php
+++ b/common/modules/product/models/ProductVariant.php
@@ -215,6 +215,10 @@ class ProductVariant extends \yii\db\ActiveRecord
         return $this->hasMany(TaxOption::className(), ['tax_option_id' => 'option_id'])->viaTable('product_variant_option', ['product_variant_id' => 'product_variant_id']);
     }
 
+    public function setOptions($value){
+        $this->_options = $value;
+    }
+
     public function getProperties() {
         $groups = $options = [];
         foreach ($this->options as $option) {
diff --git a/common/widgets/views/order.php b/common/widgets/views/order.php
index 0ad3cff..5d566f9 100755
--- a/common/widgets/views/order.php
+++ b/common/widgets/views/order.php
@@ -3,7 +3,7 @@
 <html lang="uk">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Rukzachok.com.ua</title>
+    <title>linija-svitla.ua</title>
     <style type="text/css">
         body {
             font-family: helvetica neue, arial, sans-serif;
@@ -57,8 +57,6 @@
             </td>
             <td style="text-align: left; vertical-align: top; font-size: 85%; padding: 20px 20px 15px 15px;">
                 <strong>Спасибо за Ваш заказ!</strong>
-                <br>
-                <a href="http://www.rukzachok.com.ua"
             </td>
         </tr>
         <tr>
diff --git a/console/controllers/FilterController.php b/console/controllers/FilterController.php
new file mode 100644
index 0000000..b4998c6
--- /dev/null
+++ b/console/controllers/FilterController.php
@@ -0,0 +1,198 @@
+<?php
+
+namespace console\controllers;
+
+use \common\models\FilterCache;
+use common\modules\product\helpers\FilterHelper;
+use common\modules\product\helpers\ProductHelper;
+use common\modules\product\models\Category;
+use common\modules\product\models\Product;
+use common\modules\product\models\ProductVariant;
+use common\modules\rubrication\models\TaxGroup;
+use common\modules\rubrication\models\TaxOption;
+use Yii;
+use yii\console\Controller;
+use yii\db\ActiveQuery;
+
+class FilterController extends Controller
+{
+
+    public $count = 1;
+    public $begin_time;
+    const DEPTH = 5;
+
+
+
+
+    public function actionIndex()
+    {
+        $categories = Category::find()->all();
+
+        foreach($categories as $category){
+            /**
+             *@var TaxGroup $taxGroup
+             *@var Category $category
+             *@var TaxOption $option
+             */
+
+            $taxOptions = $category->filterQuery->all();
+            $brands = $category->brands;
+            foreach($brands as $brand){
+                $taxOptions[] =  [
+                    'group_alias' => 'brands',
+                    'option_alias' => $brand->brand_id,
+                    'tax_option_id' => $brand->brand_id,
+                ];
+            }
+            $count = count($taxOptions);
+            $key = 0;
+//            $sumArray = FilterCache::find()->select('options_key')->column();
+//            print_r($sumArray);
+//            die();
+            $sumArray=[];
+            $optionsIdArray = [];
+            $params = [];
+
+            $this->begin_time = time() - 1272000000 + floatval(microtime());
+            $this->RecursiveOptionFinder($category,$count, $taxOptions,$key,$sumArray,$optionsIdArray,$params);
+
+            $end_time = time() - 1272000000 + floatval(microtime()) - $this->begin_time;
+            print_r($end_time);
+            die();
+
+            }
+    }
+
+
+    /**
+     * @param Category $category
+     * @param $count
+     * @param TaxOption array $taxOptions
+     * @param $key
+     * @param $sumArray
+     * @param $optionsIdArray
+     * @param array $params
+     */
+
+    public function RecursiveOptionFinder($category, $count, $taxOptions, $key, &$sumArray, $optionsIdArray,$params){
+
+        for($o = $key; $o <= $count; $o++){
+            if(isset($taxOptions[$o]) && (count($optionsIdArray) < self::DEPTH)){
+                $_optionsIdArray = $optionsIdArray;
+                $_optionsIdArray[] = $taxOptions[$o]['tax_option_id'];
+                $sum = FilterCache::createCacheKey($_optionsIdArray);
+                if( !in_array( $sum, $sumArray)){
+
+                    $sumArray[]  = $sum;
+                    $key = $o+1;
+                    $this->selectParams($params,$taxOptions[$o]['group_alias'], $taxOptions[$o]['option_alias']);
+                    $this->RecursiveOptionFinder($category,$count, $taxOptions, $key, $sumArray,$optionsIdArray,$params);
+                    $optionsIdArray[] = $taxOptions[$o]['tax_option_id'];
+                    $this->saveFilterCache($category,$params, $sum,$optionsIdArray);
+                    $o++;
+                } else {
+                    $optionsIdArray[] = $taxOptions[$o]['tax_option_id'];
+                    $key = $o+1;
+                    $this->selectParams($params,$taxOptions[$o]['group_alias'], $taxOptions[$o]['option_alias']);
+                    $this->RecursiveOptionFinder($category,$count, $taxOptions, $key, $sumArray,$optionsIdArray,$params);
+                    $o++;
+                }
+            }
+        }
+    }
+
+    public function selectParams(&$params,$alias,$optionAlias){
+
+        if(isset($params[$alias])){
+            $params[$alias][] = $optionAlias;
+        } else {
+
+            $params = array_merge($params, [$alias=>[$optionAlias]]);
+        }
+        return $params;
+    }
+
+    /**
+     *
+     * @param Category $category
+     * @param array $params
+     * @param $options_key
+     * @param array $optionsIdArray
+     */
+
+    public function saveFilterCache($category,$params, $options_key,$optionsIdArray){
+        $count = $this->findItem($category,$params);
+
+        $model = new FilterCache();
+        $model->category_id = $category->category_id;
+        $model->count = $count;
+        $model->depth = count($optionsIdArray);
+        $model->options_key = $options_key;
+        $model->save();
+    }
+
+
+    /**
+     * @param Category $category
+     * @param array $params
+     * @return int
+     */
+    public function findItem($category,$params){
+        return $this->getSearchQuery($category,$params)->count();
+        //$count2 = $this->getSearchQuery2($category,$params)->count();
+//        $this->count ++;
+//        if($this->count == 100){
+//            $end_time = time() - 1272000000 + floatval(microtime()) - $this->begin_time;
+//            print_r($end_time);
+//            die();
+//        }
+    }
+
+    public function getSearchQuery($category = null, $params = []) {
+
+
+            /** @var ActiveQuery $query */
+            /**@var Category $category **/
+        $query = $category->getProducts();
+
+
+        $query->select(['product.*']);
+        $query->joinWith(['enabledVariants','brand','options', 'category']);
+
+        $query->groupBy(['product.product_id', 'product_variant.price']);
+
+        ProductHelper::_setQueryParams($query, $params);
+
+        $query->andWhere(['!=', ProductVariant::tableName() .'.status', 1]);
+
+
+
+        return $query;
+
+    }
+
+//    public function getSearchQuery2($category = null, $params = []) {
+//
+//
+//        /** @var ActiveQuery $query */
+//        /**@var Category $category **/
+//        $query = $category->getProducts();
+//
+//
+//        $query->select(['product.*']);
+//        $query->joinWith(['enabledVariants','brand','options', 'category']);
+//
+//        $query->groupBy(['product.product_id', 'product_variant.price']);
+//
+//        FilterHelper::setNewQueryParams($query, $params);
+//
+//        $query->andWhere(['!=', ProductVariant::tableName() .'.status', 1]);
+//
+//
+//
+//        return $query;
+//
+//    }
+
+}
+
diff --git a/console/migrations/m160321_232402_orders1.php b/console/migrations/m160321_232402_orders1.php
deleted file mode 100755
index 13e6251..0000000
--- a/console/migrations/m160321_232402_orders1.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-use yii\db\Migration;
-
-class m160321_232402_orders extends Migration
-{
-    public function up()
-    {
-        $tableOptions = null;
-        if ($this->db->driverName === 'mysql') {
-            // http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
-            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
-        }
-
-        $this->createTable('{{%orders}}', [
-            'order_id' => $this->primaryKey(),
-            'customer_id' => $this->integer(),
-            'name' => $this->string()->notNull(),
-            'email' => $this->string()->notNull(),
-            'phone' => $this->string(32)->notNull(),
-            'delivery' => $this->integer(),
-            'payment' => $this->integer(),
-            'code' => $this->string(),
-            'status' => $this->smallInteger(),
-            'created_at' => $this->integer()->notNull(),
-            'updated_at' => $this->integer()->notNull(),
-        ], $tableOptions);
-
-        $this->createTable('{{%order_items}}', [
-            'order_items_id' => $this->primaryKey(),
-            'order_id' => $this->integer(),
-            'item_id' => $this->integer(),
-            'item_count' => $this->integer(),
-            'price' => $this->float(),
-        ], $tableOptions);
-
-        $this->addForeignKey('orders_items_fk', '{{%order_items}}', 'order_id', '{{%orders}}', 'order_id', 'CASCADE', 'CASCADE');
-        $this->addForeignKey('orders_items_items_fk', '{{%order_items}}', 'item_id', '{{%product}}', 'product_id', 'RESTRICT', 'RESTRICT');
-    }
-
-    public function down()
-    {
-        $this->dropForeignKey('orders_items_fk', '{{%order_items}}');
-        $this->dropForeignKey('orders_items_items_fk', '{{%order_items}}');
-        $this->dropTable('{{%orders}}');
-        $this->dropTable('{{%order_items}}');
-    }
-
-}
diff --git a/console/migrations/m161104_094427_filter_cache.php b/console/migrations/m161104_094427_filter_cache.php
new file mode 100644
index 0000000..62a6056
--- /dev/null
+++ b/console/migrations/m161104_094427_filter_cache.php
@@ -0,0 +1,22 @@
+<?php
+
+use yii\db\Migration;
+
+class m161104_094427_filter_cache extends Migration
+{
+    public function up()
+    {
+        $this->createTable('filter_cache', [
+            'id' => $this->primaryKey(),
+            'options_key' => $this->integer(20),
+            'category_id' => $this->integer(),
+            'depth'       => $this->integer(),
+            'count'       => $this->integer(),
+        ]);
+    }
+
+    public function down()
+    {
+        $this->dropTable('filter_cache');
+    }
+}
diff --git a/frontend/config/main.php b/frontend/config/main.php
index 71d4f7c..ac8e91d 100755
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -10,10 +10,6 @@ return [
     'id' => 'app-frontend',
     'name'=>'Лінія Світла',
     'basePath' => dirname(__DIR__),
-    'bootstrap' => [
-
-        'frontend\components\SeoComponent',
-    ],
     'controllerNamespace' => 'frontend\controllers',
     'modules' => [
 
diff --git a/frontend/controllers/AjaxController.php b/frontend/controllers/AjaxController.php
index 9dc0e13..ceba6c2 100755
--- a/frontend/controllers/AjaxController.php
+++ b/frontend/controllers/AjaxController.php
@@ -3,6 +3,11 @@
 namespace frontend\controllers;
 
 use common\models\Feedback;
+use common\modules\product\helpers\ProductHelper;
+use common\modules\product\models\Brand;
+use common\modules\product\models\Category;
+use common\modules\product\models\ProductVariant;
+use yii\db\ActiveQuery;
 use yii\web\Controller;
 use \common\modules\product\widgets\specialProducts;
 class AjaxController extends Controller
@@ -46,4 +51,62 @@ class AjaxController extends Controller
     public function actionProm(){
         return specialProducts::widget(['type' => 'promo']);
     }
+
+
+    public function actionTest(){
+        $filter = \Yii::$app->request->get('info');
+
+
+        if(!empty( $filter[ 'brands' ] )) {
+            $brands = Brand::find()
+                ->select('brand_id')
+                ->where([
+                    'in',
+                    'alias',
+                    $filter[ 'brands' ],
+                ])
+                ->all();
+            $filter[ 'brands' ] = [ ];
+            foreach($brands as $brand) {
+                $filter[ 'brands' ][] = $brand->brand_id;
+            }
+        }
+
+        if(!empty($filter)){
+            $category = Category::findOne(176);
+            return $this->findItem($category,$filter);
+        } else {
+            return 'test';
+        }
+
+    }
+
+    public function getSearchQuery($category = null, $params = []) {
+
+
+        /** @var ActiveQuery $query */
+        /**@var Category $category **/
+        $query = $category->getProducts();
+
+
+        $query->select(['product.*']);
+        $query->joinWith(['enabledVariants','brand','options', 'category']);
+
+        $query->groupBy(['product.product_id', 'product_variant.price']);
+
+        ProductHelper::_setQueryParams($query, $params);
+
+        $query->andWhere(['!=', ProductVariant::tableName() .'.status', 1]);
+
+
+
+        return $query;
+
+    }
+
+
+
+    public function findItem($category,$params){
+        return $this->getSearchQuery($category,$params)->count();
+    }
 }
\ No newline at end of file
diff --git a/frontend/controllers/CatalogController.php b/frontend/controllers/CatalogController.php
index a901dae..ea3e100 100755
--- a/frontend/controllers/CatalogController.php
+++ b/frontend/controllers/CatalogController.php
@@ -2,33 +2,22 @@
 
 namespace frontend\controllers;
 
-use common\modules\product\Filter;
+
 use common\modules\product\helpers\ProductHelper;
-use common\modules\rubrication\models\TaxOptionSearch;
 use frontend\models\ProductFrontendSearch;
 use Yii;
 use common\modules\product\models\Brand;
 use common\modules\product\models\BrandSearch;
 use common\modules\product\models\Category;
-use common\modules\product\models\CategorySearch;
 use common\modules\product\models\Product;
-use common\modules\product\models\ProductCategory;
-use common\modules\product\models\ProductOption;
-use common\modules\product\models\ProductSearch;
-use common\modules\product\models\ProductVariant;
 use common\modules\rubrication\models\TaxGroup;
-use common\modules\rubrication\models\TaxOption;
-use common\modules\rubrication\models\TaxValueString;
 use yii\data\ActiveDataProvider;
-use yii\data\Pagination;
-use yii\data\Sort;
-use yii\db\ActiveQuery;
 use yii\helpers\ArrayHelper;
-use yii\helpers\VarDumper;
-use yii\web\HttpException;
 
 class CatalogController extends \yii\web\Controller
 {
+
+
     public function actionSearch() {
         // @todo
     }
@@ -36,6 +25,7 @@ class CatalogController extends \yii\web\Controller
     public function actionCategory()
     {
 
+
         /** @var Category $category */
         $category = Yii::$app->request->get('category');
         $filter = Yii::$app->request->get('filters', [ ]);
@@ -53,21 +43,7 @@ class CatalogController extends \yii\web\Controller
             ->where([ 'is_filter' => 'TRUE' ])
             ->all(), 'alias');
 
-        if(!empty( $filter[ 'brands' ] )) {
-            unset( $filter_check[ 'brands' ] );
-            $brands = Brand::find()
-                ->select('brand_id')
-                ->where([
-                    'in',
-                    'alias',
-                    $filter[ 'brands' ],
-                ])
-                ->all();
-            $params[ 'brands' ] = [ ];
-            foreach($brands as $brand) {
-                $params[ 'brands' ][] = $brand->brand_id;
-            }
-        }
+
 
         if(!empty( $filter[ 'special' ] )) {
             unset( $filter_check[ 'special' ] );
@@ -90,6 +66,24 @@ class CatalogController extends \yii\web\Controller
             $params[ 'prices' ] = $filter[ 'prices' ];
         }
 
+        $activeFiltersParams = $filter_check;
+
+        if(!empty( $filter[ 'brands' ] )) {
+            unset( $filter_check[ 'brands' ] );
+            $brands = Brand::find()
+                ->select('brand_id')
+                ->where([
+                    'in',
+                    'alias',
+                    $filter[ 'brands' ],
+                ])
+                ->all();
+            $params[ 'brands' ] = [ ];
+            foreach($brands as $brand) {
+                $params[ 'brands' ][] = $brand->brand_id;
+            }
+        }
+
         foreach($optionsList as $optionList) {
 
             if(isset( $filter[ $optionList ] )) {
@@ -109,26 +103,70 @@ class CatalogController extends \yii\web\Controller
         }
 
         $productModel = new ProductFrontendSearch();
+
         $productProvider = $productModel->search($category, $params);
 
+
         $brandModel = new BrandSearch();
         $brands = $brandModel->getBrands($category, $params)
             ->all();
 
+
         $groups = $category->getActiveFilters();
+
+        foreach($brands as $brand){
+            array_unshift($groups , [
+                'group_alias' => 'brands',
+                'option_alias' => $brand->alias,
+                'tax_option_id' => $brand->brand_id,
+                'value' => $brand->name,
+                'alias' => 'brands',
+                'name' => 'Бренды'
+            ]);
+        }
+
+
+
+        foreach ($groups as $key=> $group) {
+            $param = $activeFiltersParams;
+            if(isset($param[$group['alias']])){
+                if(!in_array($group['option_alias'],$param[$group['alias']])){
+                    $param[$group['alias']][] = $group['option_alias'];
+                } else {
+                    continue;
+                }
+            }else {
+                $param = array_merge($param, [$group['alias']=>[$group['option_alias']]]);
+            }
+
+            $groups[$key] = array_merge($groups[$key],['cacheKey' => json_encode($param)] );
+
+        }
+
+
+
         $groups = ArrayHelper::index($groups, null, 'name');
-        $priceLimits = $productModel->priceLimits($category, $params);
+
+
+
+
+        $cacheKey = ['ActiveProperties','id' => $category, 'params' => $params];
+
+        if(!$priceLimits = Yii::$app->cache->get($cacheKey)){
+
+            $priceLimits = $productModel->priceLimits($category, $params);
+
+            Yii::$app->cache->set($cacheKey,$priceLimits,3600*24);
+        }
 
 
         return $this->render('products', [
             'category'        => $category,
-            'brandModel'      => $brandModel,
-            'brands'          => $brands,
             'filter'          => $filter,
             'params'          => $params,
             'productModel'    => $productModel,
             'productProvider' => $productProvider,
-            'groups'            => $groups,
+            'groups'          => $groups,
             'priceLimits'     => $priceLimits,
         ]);
 
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index 35c95fd..20541da 100755
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -3,6 +3,7 @@
 namespace frontend\controllers;
 
 
+use common\modules\product\models\Category;
 use Yii;
 use common\models\LoginForm;
 use frontend\models\PasswordResetRequestForm;
@@ -223,23 +224,11 @@ class SiteController extends Controller
     {
 
 
-        $category_alias = Yii::$app->request->get('category');
-        $is_count = Yii::$app->request->get('count', false);
 
-        if ( !($category = CategorySearch::findByAlias($category_alias)))
-        {
-            throw new HttpException(404, 'Данной страницы не существует!');
-        }
-
-        $products = $category->getProducts()->with(['filters','filters.group'])->joinWith('variant')->where(['product_variant.status'=>0])->all();
-
-        if ($is_count) {
-            print (count($products));
-            exit;
-        }
+        $is_count = Yii::$app->request->get('count', false);
 
+        $categories = Category::find()->all();
 
-//var_dump($products);die();
         set_time_limit (0);
         header ("Content-Type: text/xml");
         print '<?xml version="1.0" encoding="UTF-8" ?>';
@@ -250,17 +239,31 @@ class SiteController extends Controller
         print "<rate></rate>";
         print "<categories>";
 
-        print "<category>";
-        print "<id>" . $category->category_id . "</id>";
-        print "<parentId></parentId>";
-        print "<name>" . $category->name . "</name>";
-        print "</category>";
-
+        foreach($categories as $category){
+            print "<category>";
+                print "<id>" .$category->category_id . "</id>";
+                print "<name>" . $category->name. "</name>";
+            print "</category>";
+        }
         print "</categories>";
+
+
+
+
         print "<items>";
-        /** @var Product $product */
-        foreach ($products as $product)
-        {
+
+        foreach($categories as $category){
+            $products = $category->getProducts()->with(['filters','filters.group'])->joinWith('variant')->where(['product_variant.status'=>0])->all();
+
+            if ($is_count) {
+                print (count($products));
+                continue;
+            }
+
+            /** @var Product $product */
+
+            foreach ($products as $product)
+            {
 
 
                 print "<item>";
@@ -338,9 +341,19 @@ class SiteController extends Controller
                 print "</item>";
 
 
+            }
+
         }
 
 
+
+
+
+//var_dump($products);die();
+
+
+
+
         print "</items>";
 
         print "</price>";
diff --git a/frontend/models/ProductFrontendSearch.php b/frontend/models/ProductFrontendSearch.php
index 829c220..6625015 100755
--- a/frontend/models/ProductFrontendSearch.php
+++ b/frontend/models/ProductFrontendSearch.php
@@ -2,6 +2,7 @@
 
 namespace frontend\models;
 
+use common\modules\product\helpers\FilterHelper;
 use common\modules\product\helpers\ProductHelper;
 use common\modules\product\models\Category;
 use Yii;
@@ -80,9 +81,7 @@ class ProductFrontendSearch extends Product {
             ]
         ]);
 
-        if (!$this->validate()) {
-            return $dataProvider;
-        }
+
 
 
 
@@ -105,7 +104,7 @@ class ProductFrontendSearch extends Product {
 
         $query->groupBy(['product.product_id', 'product_variant.price']);
 
-        ProductHelper::_setQueryParams($query, $params);
+        FilterHelper::setNewQueryParams($query, $params);
         if($in_stock){
             $query->andWhere(['!=', ProductVariant::tableName() .'.status', 1]);
         }
diff --git a/frontend/views/catalog/_product_item.php b/frontend/views/catalog/_product_item.php
index 2a94c79..39025a3 100755
--- a/frontend/views/catalog/_product_item.php
+++ b/frontend/views/catalog/_product_item.php
@@ -10,10 +10,10 @@ use yii\helpers\Url;
         <div class="item_container" >
             <input class="prodInfo" type="hidden" value="[]">
             <div class="title">
-                <?= Html::a( $model->name, Url::to(['catalog/product', 'product' => $model->alias]), ['class'=>'btn-product-details'] )?>
+                <?= Html::a( $model->name, Url::to(['catalog/product', 'product' => $model->alias]), ['class'=>'btn-product-details','data-pjax'=>0] )?>
             </div>
             <div class="img">
-                <a class="btn-product-details"
+                <a data-pjax=0 class="btn-product-details"
 
 
                    href="<?= Url::to([
diff --git a/frontend/views/catalog/products.php b/frontend/views/catalog/products.php
index 972f4fb..91de487 100755
--- a/frontend/views/catalog/products.php
+++ b/frontend/views/catalog/products.php
@@ -4,13 +4,19 @@
      * @var View $this
      */
     use frontend\widgets\FilterWidget;
-use frontend\widgets\Seo;
-use yii\helpers\Url;
+    use frontend\widgets\Seo;
+    use yii\helpers\Url;
     use yii\web\View;
     use yii\widgets\ListView;
+    use yii\widgets\Pjax;
+    $this->registerCssFile (Yii::getAlias('@web/css/ion.rangeSlider.css'));
+    $this->registerCssFile (Yii::getAlias('@web/css/ion.rangeSlider.skinHTML5.css'));
+    $this->registerJsFile(Yii::getAlias('@web/js/ion.rangeSlider.js'),[
+        'position' => View::POS_END,
+        'depends' => ['yii\web\JqueryAsset']
+    ]);
 
-
-    $this->params['seo']['title'] = !empty($category->meta_title) ? $category->meta_title : $category->name;
+$this->params['seo']['title'] = !empty($category->meta_title) ? $category->meta_title : $category->name;
 
     $this->params['seo']['fields']['meta-title'] = $category->meta_title;
     $this->params['seo']['h1'] = !empty($category->h1) ? $category->h1 : $category->name;
@@ -29,16 +35,20 @@ use yii\helpers\Url;
         'position' => View::POS_END,
         'depends' => ['yii\web\JqueryAsset']
     ]);
+    $this->registerJsFile(Yii::getAlias('@web/js/filter.js'),[
+        'position' => View::POS_END,
+        'depends' => ['yii\web\JqueryAsset']
+    ]);
 ?>
-
+<?php Pjax::begin(['timeout' => 5000,'id'=> 'list-container'])?>
             <div class="container">
                 <div class="block-25" style="position: relative;">
                     <?= FilterWidget::widget([
                         'category'=>$category,
                         'groups'=>  $groups,
                         'filter'=>  $filter,
-                        'brands' => $brands,
-                        'priceLimits' => $priceLimits
+                        'priceLimits' => $priceLimits,
+                        //'filterBrands' => $filterBrands
                     ])?>
 
                     <div class="clearfix"></div>
@@ -92,45 +102,6 @@ use yii\helpers\Url;
 
 
 
-                            <?php $js = "$('.toolbar-list').click(function(event) {
-                                //alert(1);
-                                $('.toolbar-list').addClass('selected');
-                                $('.toolbar-grid').removeClass('selected');
-                                $('#centrit .prodBox').addClass('list');
-                                JsHttpRequest.query(
-                                    'hr_gate.php?test=500&r='+Math.random(),
-                                    {
-                                        'sp': 'prod_list_style'
-                                        ,'style': 1
-                                    },
-                                    function(result, errors) { },
-                                    true  //disable caching
-                                );
-                            });
-                            $('.toolbar-grid').click(function(event) {
-                                $('.toolbar-grid').addClass('selected');
-                                $('.toolbar-list').removeClass('selected');
-                                $('#centrit .prodBox').removeClass('list');
-                                JsHttpRequest.query(
-                                    'hr_gate.php?test=500&r='+Math.random(),
-                                    {
-                                        'sp': 'prod_list_style'
-                                        ,'style': 2
-                                    },
-                                    function(result, errors) { },
-                                    true  //disable caching
-                                );
-
-                            });
-
-
-
-
-                            ";
-                            $this->registerJs($js,View::POS_READY);
-                            ?>
-
-
 
 
                     <div class="catalog_product_list view_table">
@@ -157,6 +128,6 @@ use yii\helpers\Url;
 
                 </div>
             </div>
-
+<?php Pjax::end()?>
 
 
diff --git a/frontend/views/event/index.php b/frontend/views/event/index.php
index 84ad617..60f2fa9 100755
--- a/frontend/views/event/index.php
+++ b/frontend/views/event/index.php
@@ -32,7 +32,7 @@ $this->params['seo']['h1'] = $this->title;
 
         <div class="both"></div>
 
-        
-    </div>                                    
-                                        
+
+    </div>
+
 </div>
\ No newline at end of file
diff --git a/frontend/views/event/show.php b/frontend/views/event/show.php
index 5aae885..1d43077 100755
--- a/frontend/views/event/show.php
+++ b/frontend/views/event/show.php
@@ -71,6 +71,7 @@ $this->params['seo']['h1'] = $this->title;
 
                 <div class="catalog_product_list view_table">
                     <?= ListView::widget([
+                        'emptyText' => '',
                         'dataProvider' => $productProvider,
                         'itemView' => function ($model, $key, $index, $widget) {
                             return $this->render('../catalog/_product_item',[
diff --git a/frontend/web/css/css_header.css b/frontend/web/css/css_header.css
index 5250cd9..30d6903 100755
--- a/frontend/web/css/css_header.css
+++ b/frontend/web/css/css_header.css
@@ -26965,4 +26965,8 @@ ul.product-special li.promo div {
 
 .irs-slider.state_hover, .irs-slider{
     background: #9fa4a8;
+}
+
+.disabled-link{
+    color: grey !important;
 }
\ No newline at end of file
diff --git a/frontend/web/js/filter.js b/frontend/web/js/filter.js
new file mode 100644
index 0000000..2d75d14
--- /dev/null
+++ b/frontend/web/js/filter.js
@@ -0,0 +1,155 @@
+/**
+ * Created by vitaliy on 07.11.16.
+ */
+
+function loadService(){
+
+    $('.properties_block').each(function(){
+        var block = $(this);
+        $(this).find('input[type=checkbox]').each(function(){
+            if(this.checked){
+                block.removeClass('closed').addClass('opened');
+                block.find('ul').css({"display":"block"})
+                return true;
+            }
+
+        });
+
+    });
+
+    $('#finput').keyup(function() {
+
+        var empty = false;
+        $('#finput').each(function() {
+            if ($(this).val() == '') {
+                empty = true;
+            }
+        });
+
+        if (empty) {
+            $('.sok').attr('disabled', 'disabled').css('display','none');
+        } else {
+            $('.sok').removeAttr('disabled').css('display','inline-block');
+        }
+
+    });
+
+
+
+
+
+
+    $('.price_tooltip_close').on('click',function(){
+        $(this).parent().hide();
+    });
+
+    $('.pok').click(function(event) {
+        url = $('#purl').val();
+        price_min = $('#min_price').val();
+        price_max = $('#max_price').val();
+
+        document.location.href = url + "&pmin=" + price_min + "&pmax=" + price_max;
+    });
+
+    $('.sok').click(function(event) {
+        if ($('#finput').val() != "Артикул" && $('#finput').val() != "") {
+
+
+            document.location.href = "/search/main?word="+$('#finput').val();
+
+
+        }
+    });
+}
+
+function priceRequest(link){
+    var tag = $(link).parents('li');
+    var filter = tag.data('filter');
+    $.ajax({
+        url: "/ajax/test",
+        type: 'GET',
+        data: {info:filter},
+        success: function(result){
+            if(result=='0'){
+                $(link).addClass('disabled-link');
+                tag.find('input').prop( "disabled", true );
+                $(link).find("span").html(result);
+            } else {
+                $(link).removeClass('disabled-link');
+                tag.find('input').prop( "disabled", false );
+                $(link).find("span").html(result);
+            }
+
+
+    }});
+}
+
+
+function loadPrices(){
+    $('.filter-link').each(function(){
+        if(!$(this).parents('li').data('checked')){
+            priceRequest(this);
+        }
+
+
+    });
+}
+
+
+function priceSlider(){
+
+
+    if($('#price_interval').length){
+
+        var block = $('#price_block');
+        var link = block.data('url');
+        var min = block.data('min');
+        var max = block.data('max');
+        var from = block.data('from');
+        var to = block.data('to');
+
+
+        $('#price_interval').ionRangeSlider({
+            type: 'double',
+            min: min,
+            max: max,
+            from: from,
+            to: to,
+            grid: false,
+            onFinish: function(e) {
+                var url = link;
+                var from = e.from;
+                var to = e.to;
+                $.pjax({url: url.replace('{from}', from).replace('{to}', to), container: "#list-container",timeout:5000, scrollTo: false})
+            }
+        });
+    }
+}
+
+$( document ).ready(function() {
+    loadService();
+    loadPrices();
+    priceSlider();
+
+    $('body').on('click', '.disabled-link', function(e){
+        e.preventDefault();
+    });
+
+    $('body').on('change', '.features-option', function(){
+        var url = $(this).parents('li').find('a').attr('href');
+        $.pjax({url: url, container: '#list-container',timeout:5000,scrollTo:false })
+    });
+
+    $("#list-container").on("pjax:end", function() {
+        loadPrices();
+        loadService();
+        priceSlider();
+
+    });
+
+
+
+
+
+
+});
diff --git a/frontend/widgets/FilterList.php b/frontend/widgets/FilterList.php
new file mode 100644
index 0000000..117dae4
--- /dev/null
+++ b/frontend/widgets/FilterList.php
@@ -0,0 +1,335 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace frontend\widgets;
+
+use Yii;
+use yii\base\Widget;
+use yii\helpers\ArrayHelper;
+use yii\helpers\Url;
+use yii\helpers\Html;
+
+/**
+ * Menu displays a multi-level menu using nested HTML lists.
+ *
+ * The main property of Menu is [[items]], which specifies the possible items in the menu.
+ * A menu item can contain sub-items which specify the sub-menu under that menu item.
+ *
+ * Menu checks the current route and request parameters to toggle certain menu items
+ * with active state.
+ *
+ * Note that Menu only renders the HTML tags about the menu. It does do any styling.
+ * You are responsible to provide CSS styles to make it look like a real menu.
+ *
+ * The following example shows how to use Menu:
+ *
+ * ```php
+ * echo FilterList::widget([
+ *     'items' => [
+ *         // Important: you need to specify url as 'controller/action',
+ *         // not just as 'controller' even if default action is used.
+ *         ['label' => 'Home', 'url' => ['site/index']],
+ *         // 'Products' menu item will be selected as long as the route is 'product/index'
+ *         ['label' => 'Products', 'url' => ['product/index'], 'items' => [
+ *             ['label' => 'New Arrivals', 'url' => ['product/index', 'tag' => 'new']],
+ *             ['label' => 'Most Popular', 'url' => ['product/index', 'tag' => 'popular']],
+ *         ]],
+ *         ['label' => 'Login', 'url' => ['site/login'], 'visible' => Yii::$app->user->isGuest],
+ *     ],
+ * ]);
+ * ```
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class FilterList extends Widget
+{
+    /**
+     * @var array list of menu items. Each menu item should be an array of the following structure:
+     *
+     * - label: string, optional, specifies the menu item label. When [[encodeLabels]] is true, the label
+     *   will be HTML-encoded. If the label is not specified, an empty string will be used.
+     * - encode: boolean, optional, whether this item`s label should be HTML-encoded. This param will override
+     *   global [[encodeLabels]] param.
+     * - url: string or array, optional, specifies the URL of the menu item. It will be processed by [[Url::to]].
+     *   When this is set, the actual menu item content will be generated using [[linkTemplate]];
+     *   otherwise, [[labelTemplate]] will be used.
+     * - visible: boolean, optional, whether this menu item is visible. Defaults to true.
+     * - items: array, optional, specifies the sub-menu items. Its format is the same as the parent items.
+     * - active: boolean, optional, whether this menu item is in active state (currently selected).
+     *   If a menu item is active, its CSS class will be appended with [[activeCssClass]].
+     *   If this option is not set, the menu item will be set active automatically when the current request
+     *   is triggered by `url`. For more details, please refer to [[isItemActive()]].
+     * - template: string, optional, the template used to render the content of this menu item.
+     *   The token `{url}` will be replaced by the URL associated with this menu item,
+     *   and the token `{label}` will be replaced by the label of the menu item.
+     *   If this option is not set, [[linkTemplate]] or [[labelTemplate]] will be used instead.
+     * - submenuTemplate: string, optional, the template used to render the list of sub-menus.
+     *   The token `{items}` will be replaced with the rendered sub-menu items.
+     *   If this option is not set, [[submenuTemplate]] will be used instead.
+     * - options: array, optional, the HTML attributes for the menu container tag.
+     */
+    public $items = [];
+    /**
+     * @var array list of HTML attributes shared by all menu [[items]]. If any individual menu item
+     * specifies its `options`, it will be merged with this property before being used to generate the HTML
+     * attributes for the menu item tag. The following special options are recognized:
+     *
+     * - tag: string, defaults to "li", the tag name of the item container tags.
+     *   Set to false to disable container tag.
+     *   See also [[\yii\helpers\Html::tag()]].
+     *
+     * @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
+     */
+    public $itemOptions = [];
+    /**
+     * @var string the template used to render the body of a menu which is a link.
+     * In this template, the token `{url}` will be replaced with the corresponding link URL;
+     * while `{label}` will be replaced with the link text.
+     * This property will be overridden by the `template` option set in individual menu items via [[items]].
+     */
+    public $linkTemplate = '<a href="{url}">{label}</a>';
+    /**
+     * @var string the template used to render the body of a menu which is NOT a link.
+     * In this template, the token `{label}` will be replaced with the label of the menu item.
+     * This property will be overridden by the `template` option set in individual menu items via [[items]].
+     */
+    public $labelTemplate = '{label}';
+    /**
+     * @var string the template used to render a list of sub-menus.
+     * In this template, the token `{items}` will be replaced with the rendered sub-menu items.
+     */
+    public $submenuTemplate = "\n<ul>\n{items}\n</ul>\n";
+    /**
+     * @var boolean whether the labels for menu items should be HTML-encoded.
+     */
+    public $encodeLabels = true;
+    /**
+     * @var string the CSS class to be appended to the active menu item.
+     */
+    public $activeCssClass = 'active';
+    /**
+     * @var boolean whether to automatically activate items according to whether their route setting
+     * matches the currently requested route.
+     * @see isItemActive()
+     */
+    public $activateItems = true;
+    /**
+     * @var boolean whether to activate parent menu items when one of the corresponding child menu items is active.
+     * The activated parent menu items will also have its CSS classes appended with [[activeCssClass]].
+     */
+    public $activateParents = false;
+    /**
+     * @var boolean whether to hide empty menu items. An empty menu item is one whose `url` option is not
+     * set and which has no visible child menu items.
+     */
+    public $hideEmptyItems = true;
+    /**
+     * @var array the HTML attributes for the menu's container tag. The following special options are recognized:
+     *
+     * - tag: string, defaults to "ul", the tag name of the item container tags. Set to false to disable container tag.
+     *   See also [[\yii\helpers\Html::tag()]].
+     *
+     * @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
+     */
+    public $options = [];
+    /**
+     * @var string the CSS class that will be assigned to the first item in the main menu or each submenu.
+     * Defaults to null, meaning no such CSS class will be assigned.
+     */
+    public $firstItemCssClass;
+    /**
+     * @var string the CSS class that will be assigned to the last item in the main menu or each submenu.
+     * Defaults to null, meaning no such CSS class will be assigned.
+     */
+    public $lastItemCssClass;
+    /**
+     * @var string the route used to determine if a menu item is active or not.
+     * If not set, it will use the route of the current request.
+     * @see params
+     * @see isItemActive()
+     */
+    public $route;
+    /**
+     * @var array the parameters used to determine if a menu item is active or not.
+     * If not set, it will use `$_GET`.
+     * @see route
+     * @see isItemActive()
+     */
+    public $params;
+
+
+    /**
+     * Renders the menu.
+     */
+    public function run()
+    {
+        if ($this->route === null && Yii::$app->controller !== null) {
+            $this->route = Yii::$app->controller->getRoute();
+        }
+        if ($this->params === null) {
+            $this->params = Yii::$app->request->getQueryParams();
+        }
+        $items = $this->normalizeItems($this->items, $hasActiveChild);
+        if (!empty($items)) {
+            $options = $this->options;
+            $tag = ArrayHelper::remove($options, 'tag', 'ul');
+
+            echo Html::tag($tag, $this->renderItems($items), $options);
+        }
+    }
+
+    /**
+     * Recursively renders the menu items (without the container tag).
+     * @param array $items the menu items to be rendered recursively
+     * @return string the rendering result
+     */
+    protected function renderItems($items)
+    {
+        $n = count($items);
+        $lines = [];
+        foreach ($items as $i => $item) {
+
+            $options = array_merge($this->itemOptions, ArrayHelper::getValue($item, 'option
+s', []));
+            $tag = ArrayHelper::remove($options, 'tag
+            print_r($tag);', 'li');
+            $class = [];
+            if ($item['active']) {
+                $class[] = $this->activeCssClass;
+            }
+            if ($i === 0 && $this->firstItemCssClass !== null) {
+                $class[] = $this->firstItemCssClass;
+            }
+            if ($i === $n - 1 && $this->lastItemCssClass !== null) {
+                $class[] = $this->lastItemCssClass;
+            }
+            if (!empty($class)) {
+                if (empty($options['class'])) {
+                    $options['class'] = implode(' ', $class);
+                } else {
+                    $options['class'] .= ' ' . implode(' ', $class);
+                }
+            }
+
+            $menu = $this->renderItem($item);
+            if (!empty($item['items'])) {
+                $submenuTemplate = ArrayHelper::getValue($item, 'submenuTemplate', $this->submenuTemplate);
+                $menu .= strtr($submenuTemplate, [
+                    '{items}' => $this->renderItems($item['items']),
+                ]);
+            }
+            $lines[] = Html::tag($tag, $menu, $options);
+        }
+
+        return implode("\n", $lines);
+    }
+
+    /**
+     * Renders the content of a menu item.
+     * Note that the container and the sub-menus are not rendered here.
+     * @param array $item the menu item to be rendered. Please refer to [[items]] to see what data might be in the item.
+     * @return string the rendering result
+     */
+    protected function renderItem($item)
+    {
+        if (isset($item['url'])) {
+            $template = ArrayHelper::getValue($item, 'template', $this->linkTemplate);
+
+            return strtr($template, [
+                '{url}' => Html::encode(Url::to($item['url'])),
+                '{label}' => $item['label'],
+            ]);
+        } else {
+            $template = ArrayHelper::getValue($item, 'template', $this->labelTemplate);
+
+            return strtr($template, [
+                '{label}' => $item['label'],
+            ]);
+        }
+    }
+
+    /**
+     * Normalizes the [[items]] property to remove invisible items and activate certain items.
+     * @param array $items the items to be normalized.
+     * @param boolean $active whether there is an active child menu item.
+     * @return array the normalized menu items
+     */
+    protected function normalizeItems($items, &$active)
+    {
+        foreach ($items as $i => $item) {
+            if (isset($item['visible']) && !$item['visible']) {
+                unset($items[$i]);
+                continue;
+            }
+            if (!isset($item['label'])) {
+                $item['label'] = '';
+            }
+            $encodeLabel = isset($item['encode']) ? $item['encode'] : $this->encodeLabels;
+            $items[$i]['label'] = $encodeLabel ? Html::encode($item['label']) : $item['label'];
+            $hasActiveChild = false;
+            if (isset($item['items'])) {
+                $items[$i]['items'] = $this->normalizeItems($item['items'], $hasActiveChild);
+                if (empty($items[$i]['items']) && $this->hideEmptyItems) {
+                    unset($items[$i]['items']);
+                    if (!isset($item['url'])) {
+                        unset($items[$i]);
+                        continue;
+                    }
+                }
+            }
+            if (!isset($item['active'])) {
+                if ($this->activateParents && $hasActiveChild || $this->activateItems && $this->isItemActive($item)) {
+                    $active = $items[$i]['active'] = true;
+                } else {
+                    $items[$i]['active'] = false;
+                }
+            } elseif ($item['active']) {
+                $active = true;
+            }
+        }
+
+        return array_values($items);
+    }
+
+    /**
+     * Checks whether a menu item is active.
+     * This is done by checking if [[route]] and [[params]] match that specified in the `url` option of the menu item.
+     * When the `url` option of a menu item is specified in terms of an array, its first element is treated
+     * as the route for the item and the rest of the elements are the associated parameters.
+     * Only when its route and parameters match [[route]] and [[params]], respectively, will a menu item
+     * be considered active.
+     * @param array $item the menu item to be checked
+     * @return boolean whether the menu item is active
+     */
+    protected function isItemActive($item)
+    {
+        if (isset($item['url']) && is_array($item['url']) && isset($item['url'][0])) {
+            $route = Yii::getAlias($item['url'][0]);
+            if ($route[0] !== '/' && Yii::$app->controller) {
+                $route = Yii::$app->controller->module->getUniqueId() . '/' . $route;
+            }
+            if (ltrim($route, '/') !== $this->route) {
+                return false;
+            }
+            unset($item['url']['#']);
+            if (count($item['url']) > 1) {
+                $params = $item['url'];
+                unset($params[0]);
+                foreach ($params as $name => $value) {
+                    if ($value !== null && (!isset($this->params[$name]) || $this->params[$name] != $value)) {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/frontend/widgets/FilterWidget.php b/frontend/widgets/FilterWidget.php
index 6650af0..859d9b8 100755
--- a/frontend/widgets/FilterWidget.php
+++ b/frontend/widgets/FilterWidget.php
@@ -9,8 +9,8 @@ class FilterWidget extends Widget
     public $category;
     public $groups;
     public $filter;
-    public $brands;
     public $priceLimits;
+    public $filterWhitoutPrice;
 
 
     public function init(){
@@ -27,8 +27,7 @@ class FilterWidget extends Widget
             'category'=>$this->category,
             'groups'=>$this->groups,
             'filter'=>$this->filter,
-            'brands'=>$this->brands,
-            'priceLimits'=>$this->priceLimits
+            'priceLimits'=>$this->priceLimits,
         ]);
 
     }
diff --git a/frontend/widgets/views/_filter_view.php b/frontend/widgets/views/_filter_view.php
index af3c71b..878e710 100755
--- a/frontend/widgets/views/_filter_view.php
+++ b/frontend/widgets/views/_filter_view.php
@@ -2,6 +2,8 @@
 use common\modules\product\helpers\FilterHelper;
 use yii\helpers\Url;
 use yii\web\View;
+use frontend\widgets\FilterList;
+
 
 ?>
 
@@ -23,36 +25,6 @@ use yii\web\View;
 
 
                     <div class="filterCat">
-                        <?php if ($brands) :?>
-                        <div class="properties_block closed">
-
-                            <div class="block_title"><i></i>Бренд</div>
-
-                            <ul class="chechboxes" style="display: none;">
-                                <?php foreach($brands as $brand) :
-                                $checked = !empty($filter['brands']) && in_array($brand->alias, $filter['brands']);
-                                //
-                                $option_url = Url::to(['catalog/category', 'category' => $category, 'filters' => FilterHelper::getFilterForOption($filter, 'brands', $brand->alias, $checked)]);
-                                ?>
-                                <li>
-
-                                    <input type="checkbox" onchange="document.location='<?= $option_url?>'" class="brands-option" <?= $checked ? ' checked' : ''?> />
-                                    <div>
-                                        <label for="filter">
-                                            <a href="<?= $option_url?>"><?= $brand->name?></a>
-                                        </label>
-                                    </div>
-                                    <div class="clearfix"></div>
-
-
-
-
-                                </li>
-                                <?php endforeach?>
-                            </ul>
-
-                        </div>
-                        <?php endif?>
                         <?php foreach($groups as $group_name => $group) :?>
                         <div class="properties_block closed">
 
@@ -63,15 +35,14 @@ use yii\web\View;
                                 $checked = (isset($filter[$option['group_alias']]) && in_array($option['option_alias'], $filter[$option['group_alias']]));
                                 $option_url = Url::to(['catalog/category', 'category' => $category, 'filters' => FilterHelper::getFilterForOption($filter, $option['group_alias'], $option['option_alias'], $checked)]);
                                 ?>
-                                <li>
+                                <li data-checked="<?= $checked ? ' true' : 'false'?>" data-filter='<?= isset($option['cacheKey'])?$option['cacheKey']:''  ?>'>
 
-                                    <input type="checkbox" onchange="document.location='<?= $option_url?>'" class="features-option" <?= $checked ? ' checked' : ''?> />
+                                    <input type="checkbox" id="<?= $option['tax_option_id']?>" onchange='<?=$option_url ?>'  class="features-option"   <?= $checked ? ' checked' : ''?> />
                                     <div>
-                                        <label for="filter3278">
-                                            <a href="<?= $option_url?>"><?= $option['value']?></a>
+                                        <label for="#<?= $option['tax_option_id']?>">
+                                            <a class="filter-link" href="<?= $option_url?>"><?= $option['value']?> <span></span></a>
                                         </label>
                                     </div>
-                                    <div class="clearfix"></div>
 
                                 </li>
                             <?php endforeach?>
@@ -82,8 +53,22 @@ use yii\web\View;
                         </div>
                         <?php endforeach?>
 
-                        <?php if ($priceLimits['min'] < $priceLimits['max']) :?>
-                            <div class="properties_block">
+                        <?php if ($priceLimits['min'] < $priceLimits['max']) :
+
+                            $filterWhitoutPrice = $filter;
+                            $filterWhitoutPrice['prices'] = [
+                                'min' => '{from}',
+                                'max' => '{to}',
+                            ];
+
+                            ?>
+                            <div id="price_block" class="properties_block"
+                                 data-min="<?=$priceLimits['min']?>"
+                                 data-max="<?=$priceLimits['max']?>"
+                                 data-from="<?=((isset($filter['prices']) && !empty($filter['prices']['min'])) ? $filter['prices']['min'] : $priceLimits['min'])?>"
+                                 data-to="<?=(( isset($filter['prices']) && !empty($filter['prices']['max'])) ? $filter['prices']['max'] :  $priceLimits['max'])?>"
+                                 data-url="<?= Url::to(['catalog/category','category' => $category,'filters' => $filterWhitoutPrice])?>"
+                            >
                                 <div class="block_title"><i></i>Цена</div>
                                 <div class="price_filter first_price_li">
                                     <div class="price_slider">
@@ -99,120 +84,11 @@ use yii\web\View;
 
             </div>
 
-
-
-
-
         </div>
 
     </div>
 
 </div>
 
-<?php
-
-$js = "
-
-
-
-        $('.properties_block').each(function(){
-            var block = $(this);
-            $(this).find('input[type=checkbox]').each(function(){
-                if(this.checked){
-                    block.removeClass('closed').addClass('opened');
-                    block.find('ul').css({\"display\":\"block\"})
-                    return true;
-                }
-
-            });
-
-        });
-
-        $('#finput').keyup(function() {
-
-            var empty = false;
-            $('#finput').each(function() {
-                if ($(this).val() == '') {
-                    empty = true;
-                }
-            });
-
-            if (empty) {
-                $('.sok').attr('disabled', 'disabled').css('display','none');
-            } else {
-                $('.sok').removeAttr('disabled').css('display','inline-block');
-            }
-
-        });
-
-
-
-
-
-
-        $('.price_tooltip_close').on('click',function(){
-            $(this).parent().hide();
-        });
-
-        $('.pok').click(function(event) {
-            url = $('#purl').val();
-            price_min = $('#min_price').val();
-            price_max = $('#max_price').val();
-
-            document.location.href = url + \"&pmin=\" + price_min + \"&pmax=\" + price_max;
-        });
-
-        $('.sok').click(function(event) {
-            if ($('#finput').val() != \"Артикул\" && $('#finput').val() != \"\") {
-
-
-                document.location.href = \"/search/main?word=\"+$('#finput').val();
-
-
-            }
-        });
-
-        ";
-    $this->registerJs($js,
-        View::POS_LOAD
-    );
-
-
-    if ($priceLimits['min'] < $priceLimits['max']){
-
-        $filterWhitoutPrice = $filter;
-        $filterWhitoutPrice['prices'] = [
-            'min' => '{from}',
-            'max' => '{to}',
-        ];
-
-        $js = "
-
-
-
-            $('#price_interval').ionRangeSlider({
-                    type: 'double',
-                    min:  {$priceLimits['min']},
-                    max: {$priceLimits['max']},
-                    from: ".((isset($filter['prices']) && !empty($filter['prices']['min'])) ? $filter['prices']['min'] : $priceLimits['min']) .",
-                    to: ". ((isset($filter['prices']) && !empty($filter['prices']['max'])) ? $filter['prices']['max'] :  $priceLimits['max']) .",
-                    grid: false,
-                    onFinish: function(e) {
-                         var url = '" . Url::to([
-                        'catalog/category',
-                        'category' => $category,
-                        'filters' => $filterWhitoutPrice
-                    ])."';
-                    var from = e.from;
-                    var to = e.to;
-                    document.location = url.replace('{from}', from).replace('{to}', to);
-                    }
-                });
 
-            ";
-        $this->registerJs($js,
-            View::POS_READY
-        );
-    }
- ?>
 
--
libgit2 0.21.4