diff --git a/src/Uniqueway/Repositories/Criteria/FuzzyGroupSearch.php b/src/Uniqueway/Repositories/Criteria/FuzzyGroupSearch.php
deleted file mode 100644
index ab09d6e..0000000
--- a/src/Uniqueway/Repositories/Criteria/FuzzyGroupSearch.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Uniqueway\Repositories\Criteria;
-
-use Uniqueway\Repositories\Contracts\RepositoryInterface as Repository;
-
-class FuzzyGroupSearch extends Criteria
-{
-    /**
-     * Search query
-     *
-     * @var string
-     */
-    protected $query;
-
-    /**
-     * Search attributes
-     *
-     * @var array
-     */
-    protected $attributes;
-
-    /**
-     *
-     * @param string $query
-     * @param array $attributes
-     */
-    public function __construct($query, array $attributes)
-    {
-        $query = trim($query);
-        $query = str_replace(['\\', '%', '_'], ['\\\\', '\%', '\_'], $query);
-        $this->query = $query;
-        $this->attributes = $attributes;
-    }
-
-    /**
-     * @param $model
-     * @param Repository $repository
-     * @return mixed
-     */
-    public function apply($model, Repository $repository)
-    {
-        if (empty($this->query)) {
-            return $model;
-        }
-
-        return $model->where(function ($query) {
-            foreach ($this->attributes as $attribute) {
-                if ($attribute == 'id' && preg_match('/^\d+$/', $this->query)) {
-                    $query->orWhere($attribute, '=', $this->query);
-                } else {
-                    $pattern = '%' . $this->query . '%';
-                    $query->orWhere($attribute, 'LIKE', $pattern);
-                }
-            }
-        });
-    }
-}
diff --git a/src/Uniqueway/Repositories/Criteria/FuzzySearch.php b/src/Uniqueway/Repositories/Criteria/FuzzySearch.php
index 86d5090..6319fe2 100644
--- a/src/Uniqueway/Repositories/Criteria/FuzzySearch.php
+++ b/src/Uniqueway/Repositories/Criteria/FuzzySearch.php
@@ -44,18 +44,15 @@ public function apply($model, Repository $repository)
             return $model;
         }
 
-        $where = 'where';
-        foreach ($this->attributes as $attribute) {
-            if ($attribute == 'id' && preg_match('/^\d+$/', $this->query)) {
-                $model = $model->$where($attribute, '=', $this->query);
-            } else {
-                $pattern = '%' . $this->query . '%';
-                $model = $model->$where($attribute, 'LIKE', $pattern);
+        return $model->where(function ($query) {
+            foreach ($this->attributes as $attribute) {
+                if ($attribute == 'id' && preg_match('/^\d+$/', $this->query)) {
+                    $query->orWhere($attribute, '=', $this->query);
+                } else {
+                    $pattern = '%' . $this->query . '%';
+                    $query->orWhere($attribute, 'LIKE', $pattern);
+                }
             }
-
-            $where = 'orWhere';
-        }
-
-        return $model;
+        });
     }
 }