diff --git a/src/Finder/ProductAttributesFinder.php b/src/Finder/ProductAttributesFinder.php
index c79aaa51..d161382a 100644
--- a/src/Finder/ProductAttributesFinder.php
+++ b/src/Finder/ProductAttributesFinder.php
@@ -27,14 +27,19 @@ final class ProductAttributesFinder implements ProductAttributesFinderInterface
     /** @var string */
     private $taxonsProperty;
 
+    /** @var int */
+    private $filterMax;
+
     public function __construct(
         FinderInterface $attributesFinder,
         QueryBuilderInterface $attributesByTaxonQueryBuilder,
-        string $taxonsProperty
+        string $taxonsProperty,
+        int $filterMax = 20
     ) {
         $this->attributesFinder = $attributesFinder;
         $this->attributesByTaxonQueryBuilder = $attributesByTaxonQueryBuilder;
         $this->taxonsProperty = $taxonsProperty;
+        $this->filterMax = $filterMax;
     }
 
     public function findByTaxon(TaxonInterface $taxon): ?array
@@ -44,6 +49,6 @@ public function findByTaxon(TaxonInterface $taxon): ?array
 
         $query = $this->attributesByTaxonQueryBuilder->buildQuery($data);
 
-        return $this->attributesFinder->find($query, 20);
+        return $this->attributesFinder->find($query, $this->filterMax);
     }
 }
diff --git a/src/Finder/ProductOptionsFinder.php b/src/Finder/ProductOptionsFinder.php
index 764f607b..2100eab2 100644
--- a/src/Finder/ProductOptionsFinder.php
+++ b/src/Finder/ProductOptionsFinder.php
@@ -27,14 +27,19 @@ final class ProductOptionsFinder implements ProductOptionsFinderInterface
     /** @var string */
     private $taxonsProperty;
 
+    /** @var int */
+    private $filterMax;
+
     public function __construct(
         FinderInterface $optionsFinder,
         QueryBuilderInterface $productOptionsByTaxonQueryBuilder,
-        string $taxonsProperty
+        string $taxonsProperty,
+        int $filterMax = 20
     ) {
         $this->optionsFinder = $optionsFinder;
         $this->productOptionsByTaxonQueryBuilder = $productOptionsByTaxonQueryBuilder;
         $this->taxonsProperty = $taxonsProperty;
+        $this->filterMax = $filterMax;
     }
 
     public function findByTaxon(TaxonInterface $taxon): ?array
@@ -44,6 +49,6 @@ public function findByTaxon(TaxonInterface $taxon): ?array
 
         $query = $this->productOptionsByTaxonQueryBuilder->buildQuery($data);
 
-        return $this->optionsFinder->find($query, 20);
+        return $this->optionsFinder->find($query, $this->filterMax);
     }
 }
diff --git a/src/Resources/config/services/finder.xml b/src/Resources/config/services/finder.xml
index a2c1946a..2b5b645e 100644
--- a/src/Resources/config/services/finder.xml
+++ b/src/Resources/config/services/finder.xml
@@ -16,12 +16,14 @@
             <argument type="service" id="fos_elastica.finder.bitbag_option_taxons.default" />
             <argument type="service" id="bitbag_sylius_elasticsearch_plugin.query_builder.product_options_by_taxon" />
             <argument>%bitbag_es_shop_option_taxons_property%</argument>
+            <argument>%bitbag_es_filter_options_max%</argument>
         </service>
 
         <service id="bitbag_sylius_elasticsearch_plugin.finder.product_attributes" class="BitBag\SyliusElasticsearchPlugin\Finder\ProductAttributesFinder">
             <argument type="service" id="fos_elastica.finder.bitbag_attribute_taxons.default" />
             <argument type="service" id="bitbag_sylius_elasticsearch_plugin.query_builder.product_attributes_by_taxon" />
             <argument>%bitbag_es_shop_attribute_taxons_property%</argument>
+            <argument>%bitbag_es_filter_attributes_max%</argument>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/services/property_builder.xml b/src/Resources/config/services/property_builder.xml
index 16894cfb..faa6f724 100644
--- a/src/Resources/config/services/property_builder.xml
+++ b/src/Resources/config/services/property_builder.xml
@@ -4,6 +4,8 @@
     <parameters>
         <parameter key="bitbag_es_excluded_filter_options" type="collection" />
         <parameter key="bitbag_es_excluded_filter_attributes" type="collection" />
+        <parameter key="bitbag_es_filter_attributes_max">20</parameter>
+        <parameter key="bitbag_es_filter_options_max">20</parameter>
     </parameters>
 
     <services>