MC-37477: Advanced Search on Elasticsearch returns Configurable Product Children as Individual Search Results

Author: SmVladyslav

app/code/Magento/CatalogSearch/etc/search_request.xml

@@ -66,7 +66,7 @@
                 <queryReference clause="should" ref="sku_query"/>
                 <queryReference clause="should" ref="price_query"/>
                 <queryReference clause="should" ref="category_query"/>
-                <queryReference clause="must" ref="visibility"/>
+                <queryReference clause="must" ref="visibility_query"/>
             </query>
             <query name="sku_query" xsi:type="filteredQuery">
                 <filterReference clause="must" ref="sku_query_filter"/>
@@ -77,7 +77,7 @@
             <query name="category_query" xsi:type="filteredQuery">
                 <filterReference clause="must" ref="category_filter"/>
             </query>
-            <query name="visibility" xsi:type="filteredQuery">
+            <query name="visibility_query" xsi:type="filteredQuery">
                 <filterReference clause="must" ref="visibility_filter"/>
             </query>
         </queries>

app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php

@@ -36,7 +36,7 @@ public function __construct(
     ) {
         $this->catalogConfig = $catalogConfig;
         $this->catalogProductVisibility = $catalogProductVisibility
-            ?? ObjectManager::getInstance()->get(Visibility::class);;
+            ?? ObjectManager::getInstance()->get(Visibility::class);
     }
 
     /**