diff --git a/CHANGELOG.md b/CHANGELOG.md
index a07d2493d..b03e6dec7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,8 +23,12 @@
 - build [#1513](https://github.com/ergonode/backend/issues/1513) Removed dependency on `behat/symfony2-extension` (piotrkreft)
 
 ## CHANGELOG FOR 1.1.x
+#### 1.1.9
+- bugfix [#1848](https://github.com/ergonode/backend/issues/1848) Long response times for product grid endpoint - change query after postgress query problem (rprzedzik)
+ 
 #### 1.1.8
 - bugfix [#1848](https://github.com/ergonode/backend/issues/1848) Long response times for product grid endpoint (rprzedzik)
+
 #### 1.1.7
 - bugfix [#1816](https://github.com/ergonode/backend/issues/1816) Fixed product audits (rprzedzik)
 
diff --git a/composer.json b/composer.json
index 13eb1c90c..c81f727da 100644
--- a/composer.json
+++ b/composer.json
@@ -71,6 +71,7 @@
         "behatch/contexts": "^3.3",
         "dama/doctrine-test-bundle": "^6.6",
         "escapestudios/symfony2-coding-standard": "^3.10",
+        "fakerphp/faker": "1.17.0",
         "friends-of-behat/symfony-extension": "^2.0.5",
         "friendsofphp/proxy-manager-lts": "^1.0",
         "infection/infection": "^0.17.5",
diff --git a/composer.lock b/composer.lock
index 9681903b0..455b98b48 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cd650e8cbe9a899f4ec85d14381668f2",
+    "content-hash": "d241409f57cdcbcfb8ea987d3e6fcb3e",
     "packages": [
         {
             "name": "beberlei/assert",
@@ -9912,22 +9912,22 @@
         },
         {
             "name": "fakerphp/faker",
-            "version": "v1.16.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FakerPHP/Faker.git",
-                "reference": "271d384d216e5e5c468a6b28feedf95d49f83b35"
+                "reference": "b85e9d44eae8c52cca7aa0939483611f7232b669"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/271d384d216e5e5c468a6b28feedf95d49f83b35",
-                "reference": "271d384d216e5e5c468a6b28feedf95d49f83b35",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/b85e9d44eae8c52cca7aa0939483611f7232b669",
+                "reference": "b85e9d44eae8c52cca7aa0939483611f7232b669",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0",
                 "psr/container": "^1.0 || ^2.0",
-                "symfony/deprecation-contracts": "^2.2"
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
             },
             "conflict": {
                 "fzaninotto/faker": "*"
@@ -9946,7 +9946,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "v1.16-dev"
+                    "dev-main": "v1.17-dev"
                 }
             },
             "autoload": {
@@ -9971,9 +9971,9 @@
             ],
             "support": {
                 "issues": "https://github.com/FakerPHP/Faker/issues",
-                "source": "https://github.com/FakerPHP/Faker/tree/v1.16.0"
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.17.0"
             },
-            "time": "2021-09-06T14:53:37+00:00"
+            "time": "2021-12-05T17:14:47+00:00"
         },
         {
             "name": "friends-of-behat/mink-extension",
diff --git a/module/product/src/Infrastructure/Grid/Builder/Query/DateAttributeDataSetQueryBuilder.php b/module/product/src/Infrastructure/Grid/Builder/Query/DateAttributeDataSetQueryBuilder.php
index 1f4bfaef0..7a3df120b 100644
--- a/module/product/src/Infrastructure/Grid/Builder/Query/DateAttributeDataSetQueryBuilder.php
+++ b/module/product/src/Infrastructure/Grid/Builder/Query/DateAttributeDataSetQueryBuilder.php
@@ -56,6 +56,7 @@ public function addSelect(QueryBuilder $query, string $key, AbstractAttribute $a
 		            JOIN product_value pv ON pv.value_id = vt.value_id
 		            WHERE attribute_id = \'%s\'
                     AND language = \'%s\'
+                    AND value ~ \'^\\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$\'
 		        )',
                 $key,
                 $attribute->getId()->getValue(),
diff --git a/module/product/src/Infrastructure/Grid/Builder/Query/NumericAttributeDataSetQueryBuilder.php b/module/product/src/Infrastructure/Grid/Builder/Query/NumericAttributeDataSetQueryBuilder.php
index b3706fdd8..de0febc7b 100644
--- a/module/product/src/Infrastructure/Grid/Builder/Query/NumericAttributeDataSetQueryBuilder.php
+++ b/module/product/src/Infrastructure/Grid/Builder/Query/NumericAttributeDataSetQueryBuilder.php
@@ -55,6 +55,7 @@ public function addSelect(QueryBuilder $query, string $key, AbstractAttribute $a
 		            JOIN product_value pv ON pv.value_id = vt.value_id
 		            WHERE attribute_id = \'%s\'
                     AND language = \'%s\'
+                    AND value ~ \'^\d+(\\.\\d+)?$\'
 		        )',
                 $key,
                 $attribute->getId()->getValue(),
diff --git a/module/product/src/Infrastructure/Grid/Builder/Query/PriceAttributeDataSetQueryBuilder.php b/module/product/src/Infrastructure/Grid/Builder/Query/PriceAttributeDataSetQueryBuilder.php
index 4ff401955..c5f586b04 100644
--- a/module/product/src/Infrastructure/Grid/Builder/Query/PriceAttributeDataSetQueryBuilder.php
+++ b/module/product/src/Infrastructure/Grid/Builder/Query/PriceAttributeDataSetQueryBuilder.php
@@ -56,6 +56,7 @@ public function addSelect(QueryBuilder $query, string $key, AbstractAttribute $a
 		            JOIN product_value pv ON pv.value_id = vt.value_id
 		            WHERE attribute_id = \'%s\'
                     AND language = \'%s\'
+                    AND value ~ \'^\d+(\\.\\d+)?$\'
 		        )',
                 $key,
                 $attribute->getId()->getValue(),
diff --git a/module/product/src/Infrastructure/Grid/Builder/Query/UnitAttributeDataSetQueryBuilder.php b/module/product/src/Infrastructure/Grid/Builder/Query/UnitAttributeDataSetQueryBuilder.php
index 838479c77..aeadb9519 100644
--- a/module/product/src/Infrastructure/Grid/Builder/Query/UnitAttributeDataSetQueryBuilder.php
+++ b/module/product/src/Infrastructure/Grid/Builder/Query/UnitAttributeDataSetQueryBuilder.php
@@ -58,6 +58,7 @@ public function addSelect(QueryBuilder $query, string $key, AbstractAttribute $a
 		            JOIN product_value pv ON pv.value_id = vt.value_id
 		            WHERE attribute_id = \'%s\'
                     AND language = \'%s\'
+                    AND value ~ \'^\d+(\\.\\d+)?$\'
 		        )',
                 $key,
                 $attribute->getId()->getValue(),