diff --git a/src/ElasticSearch/Converter/Result/EsResponseToResult.php b/src/ElasticSearch/Converter/Result/EsResponseToResult.php
index 4666a1a7a69728087e142be2812ffd42373dd7e3..008fe27945dccef4124ace29c4e07c74bb9ec190 100644
--- a/src/ElasticSearch/Converter/Result/EsResponseToResult.php
+++ b/src/ElasticSearch/Converter/Result/EsResponseToResult.php
@@ -93,7 +93,7 @@ final class EsResponseToResult
             $facet = new FacetResult(FacetType::LIST, $code);
 
             foreach ($valueBucket as $value) {
-                $count = 0;
+                $count = $value['doc_count'];
 
                 if (isset($bucketsFiltered[$code][$value['key']])) {
                     $count = $bucketsFiltered[$code][$value['key']]['doc_count'];
diff --git a/src/ElasticSearch/Document/ProductDocument.php b/src/ElasticSearch/Document/ProductDocument.php
index 1b99a58921030aeb8209454e8e8566e68d09c4f4..9c6fdcbe26c37cd946b9f5f9c00f258dc68f2372 100644
--- a/src/ElasticSearch/Document/ProductDocument.php
+++ b/src/ElasticSearch/Document/ProductDocument.php
@@ -113,7 +113,7 @@ class ProductDocument implements Document
 
         $result = array_replace_recursive($document, $this->properties);
         if (true === $this->skipEmpty) {
-            $result = ArrayHelper::array_filter_recursive($result);
+            $result = ArrayHelper::array_filter_recursive($result, static fn ($val) => $val !== null || $val === false);
         }
 
         return $result;