diff --git a/composer.json b/composer.json
index c1f18b161..a64bc64bc 100644
--- a/composer.json
+++ b/composer.json
@@ -38,8 +38,7 @@
         "smile-sa/module-elasticsuite-catalog": "self.version",
         "smile-sa/module-elasticsuite-swatches": "self.version",
         "smile-sa/module-elasticsuite-thesaurus": "self.version",
-        "smile-sa/module-elasticsuite-tracker": "self.version",
-        "smile-sa/module-elasticsuite-catalog-autocomplete": "self.version"
+        "smile-sa/module-elasticsuite-tracker": "self.version"
     },
     "require-dev": {
         "phpunit/phpunit": "*",
@@ -56,16 +55,14 @@
             "src/module-elasticsuite-catalog/registration.php",
             "src/module-elasticsuite-swatches/registration.php",
             "src/module-elasticsuite-thesaurus/registration.php",
-            "src/module-elasticsuite-tracker/registration.php",
-            "src/module-elasticsuite-catalog-autocomplete/registration.php"
+            "src/module-elasticsuite-tracker/registration.php"
         ],
         "psr-4" : {
             "Smile\\ElasticSuiteCore\\" : "src/module-elasticsuite-core",
             "Smile\\ElasticSuiteCatalog\\" : "src/module-elasticsuite-catalog",
             "Smile\\ElasticSuiteSwatches\\" : "src/module-elasticsuite-swatches",
             "Smile\\ElasticSuiteThesaurus\\" : "src/module-elasticsuite-thesaurus",
-            "Smile\\ElasticSuiteTracker\\" : "src/module-elasticsuite-tracker",
-            "Smile\\ElasticSuiteCatalogAutocomplete\\" : "src/module-elasticsuite-catalog-autocomplete"
+            "Smile\\ElasticSuiteTracker\\" : "src/module-elasticsuite-tracker"
         }
     },
     "extra": {
diff --git a/src/module-elasticsuite-catalog-autocomplete/composer.json b/src/module-elasticsuite-catalog-autocomplete/composer.json
deleted file mode 100644
index c86a2ffc3..000000000
--- a/src/module-elasticsuite-catalog-autocomplete/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name" : "smile-sa/module-elasticsuite-catalog-autocomplete",
-    "type" : "magento2-module",
-    "license" : "OSL-3.0",
-    "authors" : [{
-        "name" : "Aurélien FOUCRET",
-        "email" : "aurelien.foucret@smile.fr"
-    },
-    {
-        "name" : "Romain RUAUD",
-        "email" : "romain.ruaud@smile.fr"
-    }
-    ],
-    "description" : "Smile ElasticSuite - Catalog search module.",
-    "homepage" : "https://github.com/Smile-SA/module-elasticsuite-catalog-autocomplete",
-    "keywords" : [
-        "magento",
-        "magento2",
-        "elasticsearch",
-        "search",
-        "merchandising",
-        "core",
-        "setup"
-    ],
-    "require" : {
-        "magento/framework" : "*",
-        "magento/module-store" : "*",
-        "magento/module-backend" : "*",
-        "magento/module-catalog" : "*",
-        "magento/module-catalog-search" : "*",
-        "magento/magento-composer-installer" : "*",
-        "elasticsearch/elasticsearch" : "2.1.*"
-    },
-    "autoload" : {
-        "files" : [
-            "registration.php"
-        ],
-        "psr-4" : {
-            "Smile\\ElasticSuiteCatalogAutocomplete\\" : ""
-        }
-    }
-}
diff --git a/src/module-elasticsuite-catalog-autocomplete/etc/module.xml b/src/module-elasticsuite-catalog-autocomplete/etc/module.xml
deleted file mode 100644
index 33f568afe..000000000
--- a/src/module-elasticsuite-catalog-autocomplete/etc/module.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Smile_ElasticSuiteAutocomplete module loading configuration.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Smile Elastic Suite to newer
- * versions in the future.
- *
- *
- * @category  Smile
- * @package   Smile_ElasticSuiteCatalogAutocomplete
- * @author    Romain RUAUD <romain.ruaud@smile.fr>
- * @copyright 2016 Smile
- * @license   Open Software License ("OSL") v. 3.0
- */
- -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Smile_ElasticSuiteCatalogAutocomplete" setup_version="1.0.0">
-        <sequence>
-            <module name="Smile_ElasticSuiteCatalog" />
-        </sequence>
-    </module>
-</config>
diff --git a/src/module-elasticsuite-catalog-autocomplete/registration.php b/src/module-elasticsuite-catalog-autocomplete/registration.php
deleted file mode 100644
index 032d139a3..000000000
--- a/src/module-elasticsuite-catalog-autocomplete/registration.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Smile Elastic Suite to newer
- * versions in the future.
- *
- *
- * @category  Smile
- * @package   Smile_ElasticSuiteCatalogAutocomplete
- * @author    Aurelien FOUCRET <aurelien.foucret@smile.fr>
- * @copyright 2016 Smile
- * @license   Open Software License ("OSL") v. 3.0
- */
-
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Smile_ElasticSuiteCatalogAutocomplete',
-    __DIR__
-);
diff --git a/src/module-elasticsuite-catalog-autocomplete/Model/Autocomplete/Product/DataProvider.php b/src/module-elasticsuite-catalog/Model/Autocomplete/Product/DataProvider.php
similarity index 74%
rename from src/module-elasticsuite-catalog-autocomplete/Model/Autocomplete/Product/DataProvider.php
rename to src/module-elasticsuite-catalog/Model/Autocomplete/Product/DataProvider.php
index ccf66135c..e198a3c3a 100644
--- a/src/module-elasticsuite-catalog-autocomplete/Model/Autocomplete/Product/DataProvider.php
+++ b/src/module-elasticsuite-catalog/Model/Autocomplete/Product/DataProvider.php
@@ -6,28 +6,34 @@
  * versions in the future.
  *
  * @category  Smile
- * @package   Smile_ElasticSuiteCatalogAutocomplete
+ * @package   Smile_ElasticSuiteCatalog
  * @author    Aurelien FOUCRET <aurelien.foucret@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
  */
-namespace Smile\ElasticSuiteCatalogAutocomplete\Model\Autocomplete\Product;
+namespace Smile\ElasticSuiteCatalog\Model\Autocomplete\Product;
 
 use Magento\Search\Model\Autocomplete\DataProviderInterface;
 use Magento\Search\Model\Autocomplete\ItemFactory;
 use Magento\Search\Model\QueryFactory;
-use Smile\ElasticSuiteCatalogAutocomplete\Model\Autocomplete\Terms\DataProvider as TermDataProvider;
+use Smile\ElasticSuiteCore\Helper\Autocomplete as ConfigurationHelper;
 use Smile\ElasticSuiteCatalog\Model\ResourceModel\Product\Fulltext\CollectionFactory as ProductCollectionFactory;
+use Smile\ElasticSuiteCore\Model\Autocomplete\Terms\DataProvider as TermDataProvider;
 
 /**
  * Catalog product autocomplete data provider.
  *
  * @category Smile
- * @package  Smile_ElasticSuiteCatalogAutocomplete
+ * @package  Smile_ElasticSuiteCatalog
  * @author   Aurelien FOUCRET <aurelien.foucret@smile.fr>
  */
 class DataProvider implements DataProviderInterface
 {
+    /**
+     * Autocomplete type
+     */
+    const AUTOCOMPLETE_TYPE = "product";
+
     /**
      * Autocomplete result item factory
      *
@@ -57,6 +63,16 @@ class DataProvider implements DataProviderInterface
      */
     protected $imageHelper;
 
+    /**
+     * @var ConfigurationHelper
+     */
+    protected $configurationHelper;
+
+    /**
+     * @var string Autocomplete result type
+     */
+    private $type;
+
     /**
      * Constructor.
      *
@@ -65,20 +81,35 @@ class DataProvider implements DataProviderInterface
      * @param TermDataProvider                $termDataProvider         Search terms suggester.
      * @param ProductCollectionFactory        $productCollectionFactory Product collection factory.
      * @param \Magento\Catalog\Helper\Product $productHelper            Catalog Image helper.
+     * @param ConfigurationHelper             $configurationHelper      Autocomplete configuration helper.
+     * @param string                          $type                     Autocomplete provider type.
      */
     public function __construct(
         ItemFactory $itemFactory,
         QueryFactory $queryFactory,
         TermDataProvider $termDataProvider,
         ProductCollectionFactory $productCollectionFactory,
-        \Magento\Catalog\Helper\Product $productHelper
+        \Magento\Catalog\Helper\Product $productHelper,
+        ConfigurationHelper $configurationHelper,
+        $type = self::AUTOCOMPLETE_TYPE
     ) {
         $this->itemFactory              = $itemFactory;
         $this->queryFactory             = $queryFactory;
         $this->termDataProvider         = $termDataProvider;
         $this->productCollectionFactory = $productCollectionFactory;
         $this->imageHelper              = $productHelper;
+        $this->configurationHelper      = $configurationHelper;
+        $this->type                     = $type;
     }
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -87,7 +118,6 @@ public function getItems()
         $result = [];
         $productCollection = $this->getProductCollection();
         if ($productCollection) {
-            \Magento\Catalog\Model\Product::ATTRIBUTE_SET_ID;
             foreach ($productCollection as $product) {
                 $result[] = $this->itemFactory->create(
                     [
@@ -96,7 +126,7 @@ public function getItems()
                         'url'         => $product->getProductUrl(),
                         'price'       => $product->getFinalPrice(),
                         'final_price' => $product->getPrice(), // The getPrice method returns always 0.
-                        'type'        => 'product',
+                        'type'        => $this->getType(),
                     ]
                 );
             }
@@ -140,7 +170,7 @@ private function getProductCollection()
 
         $productCollection = $this->productCollectionFactory->create();
         $productCollection->addSearchFilter($terms);
-        $productCollection->setPageSize(5);
+        $productCollection->setPageSize($this->getResultsPageSize());
         $productCollection
             ->addAttributeToSelect('name')
             ->addAttributeToSelect('small_image')
@@ -148,4 +178,14 @@ private function getProductCollection()
 
         return $productCollection;
     }
+
+    /**
+     * Retrieve number of products to display in autocomplete results
+     *
+     * @return int
+     */
+    private function getResultsPageSize()
+    {
+        return $this->configurationHelper->getMaxSize($this->getType());
+    }
 }
diff --git a/src/module-elasticsuite-catalog/etc/adminhtml/system.xml b/src/module-elasticsuite-catalog/etc/adminhtml/system.xml
new file mode 100644
index 000000000..04effe64f
--- /dev/null
+++ b/src/module-elasticsuite-catalog/etc/adminhtml/system.xml
@@ -0,0 +1,30 @@
+<!--
+/**
+ * Smile ElasticSuiteCatalog module configuration
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Smile Searchandising Suite to newer
+ * versions in the future.
+ *
+ * @category  Smile
+ * @package   Smile_ElasticSuiteCatalog
+ * @author    Romain RUAUD <romain.ruaud@smile.fr>
+ * @copyright 2016 Smile
+ * @license   Apache License Version 2.0
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="smile_elasticsuite_core_autocomplete_settings">
+            <group id="product_autocomplete" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Product Autocomplete</label>
+                <field id="max_size" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Max size</label>
+                    <validate>integer</validate>
+                    <comment><![CDATA[Maximum number of products to display in autocomplete results.]]></comment>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/src/module-elasticsuite-catalog/etc/config.xml b/src/module-elasticsuite-catalog/etc/config.xml
index fdffb6bf9..3a0b62747 100644
--- a/src/module-elasticsuite-catalog/etc/config.xml
+++ b/src/module-elasticsuite-catalog/etc/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 
+<!--
 /**
  * DISCLAIMER
  *
@@ -21,5 +21,10 @@
                 <engine>elasticsuite</engine>
             </search>
         </catalog>
+        <smile_elasticsuite_autocomplete_settings>
+            <product_autocomplete>
+                <max_size>5</max_size>
+            </product_autocomplete>
+        </smile_elasticsuite_autocomplete_settings>
     </default>
 </config>
diff --git a/src/module-elasticsuite-catalog/etc/frontend/di.xml b/src/module-elasticsuite-catalog/etc/frontend/di.xml
index 45c6fc7b2..44826fb40 100644
--- a/src/module-elasticsuite-catalog/etc/frontend/di.xml
+++ b/src/module-elasticsuite-catalog/etc/frontend/di.xml
@@ -59,4 +59,25 @@
         </arguments>
     </virtualType>
 
+    <type name="Magento\Search\Model\Autocomplete">
+        <arguments>
+            <argument name="dataProviders" xsi:type="array">
+                <item name="20" xsi:type="object">Smile\ElasticSuiteCatalog\Model\Autocomplete\Product\DataProvider</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Smile\ElasticSuiteCore\Block\Search\Form\Autocomplete">
+        <arguments>
+            <argument name="rendererList" xsi:type="array">
+                <item name="product" xsi:type="array">
+                    <item name="title" xsi:type="string">Products</item>
+                    <item name="template" xsi:type="string">Smile_ElasticSuiteCatalog/autocomplete/product</item>
+                </item>
+                <item name="category" xsi:type="array">
+                    <item name="title" xsi:type="string">Categories</item>
+                    <item name="template" xsi:type="string">Smile_ElasticSuiteCatalog/autocomplete/category</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/src/module-elasticsuite-catalog/i18n/fr_FR.csv b/src/module-elasticsuite-catalog/i18n/fr_FR.csv
index 37143eb1e..d5d440c90 100644
--- a/src/module-elasticsuite-catalog/i18n/fr_FR.csv
+++ b/src/module-elasticsuite-catalog/i18n/fr_FR.csv
@@ -26,3 +26,6 @@ OK,OK
 "Is Spellchecked","Recherche Approchante"
 Yes,Yes
 No,No
+"Product Autocomplete","Autocomplétion des produits"
+"Max size","Taille maximum"
+"Maximum number of products to display in autocomplete results.","Nombre maximum de produits à afficher dans les résultats de l'autocomplétion."
diff --git a/src/module-elasticsuite-catalog/view/frontend/web/css/source/_module.less b/src/module-elasticsuite-catalog/view/frontend/web/css/source/_module.less
index 4cfd54237..47278616d 100644
--- a/src/module-elasticsuite-catalog/view/frontend/web/css/source/_module.less
+++ b/src/module-elasticsuite-catalog/view/frontend/web/css/source/_module.less
@@ -61,3 +61,25 @@
     border-bottom: none;
     font-weight: bold;
 }
+
+.smile-elasticsuite-autocomplete-result {
+    .product-image-box {
+        float: left;
+        padding: 0 5px;
+        width: 55px;
+    }
+
+    .product-shop {
+        float: left;
+        margin: 0 10px 0 0;
+        padding: 0;
+        white-space: normal;
+        width: 60%;
+    }
+
+    .product-item {
+        .price-box {
+            margin: 5px 0;
+        }
+    }
+}
diff --git a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/template/autocomplete/category.html b/src/module-elasticsuite-catalog/view/frontend/web/template/autocomplete/category.html
similarity index 91%
rename from src/module-elasticsuite-catalog-autocomplete/view/frontend/web/template/autocomplete/category.html
rename to src/module-elasticsuite-catalog/view/frontend/web/template/autocomplete/category.html
index ab0701f08..d4c815721 100644
--- a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/template/autocomplete/category.html
+++ b/src/module-elasticsuite-catalog/view/frontend/web/template/autocomplete/category.html
@@ -7,7 +7,7 @@
 *
 *
 * @category  Smile
-* @package   Smile_ElasticSuiteCatalogAutocomplete
+* @package   Smile_ElasticSuiteCatalog
 * @author    Romain Ruaud <romain.ruaud@smile.fr>
 * @copyright 2016 Smile
 * @license   Open Software License ("OSL") v. 3.0
diff --git a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/template/autocomplete/product.html b/src/module-elasticsuite-catalog/view/frontend/web/template/autocomplete/product.html
similarity index 95%
rename from src/module-elasticsuite-catalog-autocomplete/view/frontend/web/template/autocomplete/product.html
rename to src/module-elasticsuite-catalog/view/frontend/web/template/autocomplete/product.html
index fa76f5c55..f69615e9e 100644
--- a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/template/autocomplete/product.html
+++ b/src/module-elasticsuite-catalog/view/frontend/web/template/autocomplete/product.html
@@ -7,7 +7,7 @@
 *
 *
 * @category  Smile
-* @package   Smile_ElasticSuiteCatalogAutocomplete
+* @package   Smile_ElasticSuiteCatalog
 * @author    Romain Ruaud <romain.ruaud@smile.fr>
 * @copyright 2016 Smile
 * @license   Open Software License ("OSL") v. 3.0
diff --git a/src/module-elasticsuite-catalog-autocomplete/Block/Search/Form/Autocomplete.php b/src/module-elasticsuite-core/Block/Search/Form/Autocomplete.php
similarity index 94%
rename from src/module-elasticsuite-catalog-autocomplete/Block/Search/Form/Autocomplete.php
rename to src/module-elasticsuite-core/Block/Search/Form/Autocomplete.php
index 7d1a64198..31cdd74e5 100644
--- a/src/module-elasticsuite-catalog-autocomplete/Block/Search/Form/Autocomplete.php
+++ b/src/module-elasticsuite-core/Block/Search/Form/Autocomplete.php
@@ -5,12 +5,12 @@
  * versions in the future.
  *
  * @category  Smile
- * @package   Smile_ElasticSuiteCatalogAutocomplete
+ * @package   Smile_ElasticSuiteCore
  * @author    Romain Ruaud <romain.ruaud@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
  */
-namespace Smile\ElasticSuiteCatalogAutocomplete\Block\Search\Form;
+namespace Smile\ElasticSuiteCore\Block\Search\Form;
 
 use Magento\Framework\Locale\FormatInterface;
 
@@ -18,7 +18,7 @@
  * Quick Form block for Autocomplete
  *
  * @category Smile
- * @package  Smile_ElasticSuiteCatalogAutocomplete
+ * @package  Smile_ElasticSuiteCore
  * @author   Romain Ruaud <romain.ruaud@smile.fr>
  */
 class Autocomplete extends \Magento\Framework\View\Element\Template
diff --git a/src/module-elasticsuite-core/Helper/Autocomplete.php b/src/module-elasticsuite-core/Helper/Autocomplete.php
new file mode 100644
index 000000000..8e9c45bb6
--- /dev/null
+++ b/src/module-elasticsuite-core/Helper/Autocomplete.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * DISCLAIMER
+ * Do not edit or add to this file if you wish to upgrade Smile Elastic Suite to newer
+ * versions in the future.
+ *
+ * @category  Smile
+ * @package   Smile_ElasticSuiteCore
+ * @author    Romain Ruaud <romain.ruaud@smile.fr>
+ * @copyright 2016 Smile
+ * @license   Open Software License ("OSL") v. 3.0
+ */
+namespace Smile\ElasticSuiteCore\Helper;
+
+/**
+ * Autocomplete Settings related helper
+ *
+ * @category Smile
+ * @package  Smile_ElasticSuiteCore
+ * @author   Romain Ruaud <romain.ruaud@smile.fr>
+ */
+class Autocomplete extends AbstractConfiguration
+{
+    /**
+     * @var string
+     */
+    const AUTOCOMPLETE_SETTINGS_CONFIG_XML_PREFIX = 'smile_elasticsuite_autocomplete_settings';
+
+    /**
+     * Retrieve Max Size for a given type of autocomplete results
+     *
+     * @param string $type The type of autocomplete element
+     *
+     * @return int
+     */
+    public function getMaxSize($type = null)
+    {
+        if ($type === null) {
+            throw new \LogicException('Autocomplete type is missing');
+        }
+
+        $configPath = sprintf("%s_autocomplete/max_size", $type);
+
+        return (int) $this->getConfigValue($configPath);
+    }
+
+    /**
+     * Retrieve a configuration value by its key
+     *
+     * @param string $key The configuration key
+     *
+     * @return mixed
+     */
+    protected function getConfigValue($key)
+    {
+        return $this->scopeConfig->getValue(self::AUTOCOMPLETE_SETTINGS_CONFIG_XML_PREFIX . "/" . $key);
+    }
+}
diff --git a/src/module-elasticsuite-catalog-autocomplete/Model/Autocomplete/Terms/DataProvider.php b/src/module-elasticsuite-core/Model/Autocomplete/Terms/DataProvider.php
similarity index 56%
rename from src/module-elasticsuite-catalog-autocomplete/Model/Autocomplete/Terms/DataProvider.php
rename to src/module-elasticsuite-core/Model/Autocomplete/Terms/DataProvider.php
index 4dedb592c..ae7ef79ec 100644
--- a/src/module-elasticsuite-catalog-autocomplete/Model/Autocomplete/Terms/DataProvider.php
+++ b/src/module-elasticsuite-core/Model/Autocomplete/Terms/DataProvider.php
@@ -6,27 +6,33 @@
  * versions in the future.
  *
  * @category  Smile
- * @package   Smile_ElasticSuiteCatalogAutocomplete
+ * @package   Smile_ElasticSuiteCore
  * @author    Aurelien FOUCRET <aurelien.foucret@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
  */
-namespace Smile\ElasticSuiteCatalogAutocomplete\Model\Autocomplete\Terms;
+namespace Smile\ElasticSuiteCore\Model\Autocomplete\Terms;
 
 use Magento\Search\Model\ResourceModel\Query\Collection;
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\Autocomplete\DataProviderInterface;
 use Magento\Search\Model\Autocomplete\ItemFactory;
+use Smile\ElasticSuiteCore\Helper\Autocomplete as ConfigurationHelper;
 
 /**
  * Popular search terms data provider.
  *
  * @category Smile
- * @package  Smile_ElasticSuiteCatalogAutocomplete
+ * @package  Smile_ElasticSuiteCore
  * @author   Aurelien FOUCRET <aurelien.foucret@smile.fr>
  */
 class DataProvider implements DataProviderInterface
 {
+    /**
+     * Autocomplete type
+     */
+    const AUTOCOMPLETE_TYPE = "term";
+
     /**
      * Query factory
      *
@@ -41,24 +47,48 @@ class DataProvider implements DataProviderInterface
      */
     protected $itemFactory;
 
+    /**
+     * @var ConfigurationHelper
+     */
+    protected $configurationHelper;
+
     /**
      *
      * @var \Magento\Search\Model\Autocomplete\Item[]
      */
     private $items;
 
+    /**
+     * @var string
+     */
+    private $type;
+
     /**
      * Constructor.
      *
-     * @param QueryFactory $queryFactory Search query text factory.
-     * @param ItemFactory  $itemFactory  Suggest terms item facory.
+     * @param QueryFactory        $queryFactory        Search query text factory.
+     * @param ItemFactory         $itemFactory         Suggest terms item facory.
+     * @param ConfigurationHelper $configurationHelper Autocomplete configuration helper.
+     * @param string              $type                Autocomplete items type.
      */
     public function __construct(
         QueryFactory $queryFactory,
-        ItemFactory $itemFactory
+        ItemFactory $itemFactory,
+        ConfigurationHelper $configurationHelper,
+        $type = self::AUTOCOMPLETE_TYPE
     ) {
-        $this->queryFactory = $queryFactory;
-        $this->itemFactory = $itemFactory;
+        $this->queryFactory        = $queryFactory;
+        $this->itemFactory         = $itemFactory;
+        $this->configurationHelper = $configurationHelper;
+        $this->type                = $type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
     }
 
     /**
@@ -73,7 +103,7 @@ public function getItems()
                 $resultItem = $this->itemFactory->create([
                     'title' => $item->getQueryText(),
                     'num_results' => $item->getNumResults(),
-                    'type'        => 'term',
+                    'type'        => $this->getType(),
                 ]);
                 $this->items[] = $resultItem;
             }
@@ -90,8 +120,18 @@ public function getItems()
     private function getSuggestCollection()
     {
         $queryCollection = $this->queryFactory->get()->getSuggestCollection();
-        $queryCollection->addFieldToFilter('is_spellchecked', 'false')->setPageSize(3);
+        $queryCollection->addFieldToFilter('is_spellchecked', 'false')->setPageSize($this->getResultsPageSize());
 
         return $queryCollection;
     }
+
+    /**
+     * Retrieve number of products to display in autocomplete results
+     *
+     * @return int
+     */
+    private function getResultsPageSize()
+    {
+        return $this->configurationHelper->getMaxSize($this->getType());
+    }
 }
diff --git a/src/module-elasticsuite-core/etc/adminhtml/system.xml b/src/module-elasticsuite-core/etc/adminhtml/system.xml
index 2166191bc..25e13a6bd 100644
--- a/src/module-elasticsuite-core/etc/adminhtml/system.xml
+++ b/src/module-elasticsuite-core/etc/adminhtml/system.xml
@@ -18,17 +18,17 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        
+
         <tab id="smile_elasticsuite" translate="label" sortOrder="210">
             <label>Smile ElasticSuite</label>
         </tab>
-        
+
         <section id="smile_elasticsuite_core_base_settings" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
             <class>separator-top</class>
             <label>Base settings</label>
             <tab>smile_elasticsuite</tab>
             <resource>Magento_Catalog::config_smile_elasticsuite_core_base_settings</resource>
-            
+
             <group id="es_client" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>ElaticSearch Client</label>
                 <field id="servers" translate="label comment" type="text" sortOrder="51" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -45,7 +45,7 @@
                     <frontend_class>validate-number</frontend_class>
                 </field>
             </group>
-            
+
             <group id="indices_settings" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Indices settings</label>
                 <field id="alias" translate="label" type="text" sortOrder="54" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -64,5 +64,18 @@
                 </field>
             </group>
         </section>
+        <section id="smile_elasticsuite_autocomplete_settings" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Autocomplete</label>
+            <tab>smile_elasticsuite</tab>
+            <resource>Magento_Backend::smile_elasticsuite_autocomplete</resource>
+            <group id="term_autocomplete" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Popular Term Autocomplete</label>
+                <field id="max_size" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Max size</label>
+                    <validate>integer</validate>
+                    <comment><![CDATA[Maximum number of popular search terms to display in autocomplete results.]]></comment>
+                </field>
+            </group>
+        </section>
     </system>
 </config>
diff --git a/src/module-elasticsuite-core/etc/config.xml b/src/module-elasticsuite-core/etc/config.xml
index fcf7bf761..4cb477dba 100644
--- a/src/module-elasticsuite-core/etc/config.xml
+++ b/src/module-elasticsuite-core/etc/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 
+<!--
 /**
  * Smile_ElasticSuiteCore default configuration.
  *
@@ -33,5 +33,12 @@
                 <batch_indexing_size>100</batch_indexing_size>
             </indices_settings>
         </smile_elasticsuite_core_base_settings>
+
+        <smile_elasticsuite_autocomplete_settings>
+            <term_autocomplete>
+                <max_size>3</max_size>
+            </term_autocomplete>
+        </smile_elasticsuite_autocomplete_settings>
+
     </default>
 </config>
diff --git a/src/module-elasticsuite-catalog-autocomplete/etc/frontend/di.xml b/src/module-elasticsuite-core/etc/frontend/di.xml
similarity index 52%
rename from src/module-elasticsuite-catalog-autocomplete/etc/frontend/di.xml
rename to src/module-elasticsuite-core/etc/frontend/di.xml
index 2f86daac7..ea6c3bc51 100644
--- a/src/module-elasticsuite-catalog-autocomplete/etc/frontend/di.xml
+++ b/src/module-elasticsuite-core/etc/frontend/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Smile_ElasticSuiteCatalogAutocomplete frontend dependency injection configuration.
+ * Smile_ElasticSuiteCore frontend dependency injection configuration.
  *
  * DISCLAIMER
  *
@@ -9,7 +9,7 @@
  * versions in the future.
  *
  * @category  Smile
- * @package   Smile_ElasticSuiteCatalogAutocomplete
+ * @package   Smile_ElasticSuiteCore
  * @author    Romain RUAUD <romain.ruaud@smile.fr>
  * @author    Aurelien FOUCRET <aurelien.foucret@smile.fr>
  * @copyright 2016 Smile
@@ -20,25 +20,16 @@
     <type name="Magento\Search\Model\Autocomplete">
         <arguments>
             <argument name="dataProviders" xsi:type="array">
-                <item name="10" xsi:type="object">Smile\ElasticSuiteCatalogAutocomplete\Model\Autocomplete\Terms\DataProvider</item>
-                <item name="20" xsi:type="object">Smile\ElasticSuiteCatalogAutocomplete\Model\Autocomplete\Product\DataProvider</item>
+                <item name="10" xsi:type="object">Smile\ElasticSuiteCore\Model\Autocomplete\Terms\DataProvider</item>
             </argument>
         </arguments>
     </type>
-    <type name="Smile\ElasticSuiteCatalogAutocomplete\Block\Search\Form\Autocomplete">
+    <type name="Smile\ElasticSuiteCore\Block\Search\Form\Autocomplete">
         <arguments>
             <argument name="rendererList" xsi:type="array">
                 <item name="term" xsi:type="array">
                     <item name="title" xsi:type="string">Search terms</item>
-                    <item name="template" xsi:type="string">Smile_ElasticSuiteCatalogAutocomplete/autocomplete/term</item>
-                </item>
-                <item name="product" xsi:type="array">
-                    <item name="title" xsi:type="string">Products</item>
-                    <item name="template" xsi:type="string">Smile_ElasticSuiteCatalogAutocomplete/autocomplete/product</item>
-                </item>
-                <item name="category" xsi:type="array">
-                    <item name="title" xsi:type="string">Categories</item>
-                    <item name="template" xsi:type="string">Smile_ElasticSuiteCatalogAutocomplete/autocomplete/category</item>
+                    <item name="template" xsi:type="string">Smile_ElasticSuiteCore/autocomplete/term</item>
                 </item>
             </argument>
         </arguments>
diff --git a/src/module-elasticsuite-core/i18n/fr_FR.csv b/src/module-elasticsuite-core/i18n/fr_FR.csv
index 90f9235df..ec34654a4 100644
--- a/src/module-elasticsuite-core/i18n/fr_FR.csv
+++ b/src/module-elasticsuite-core/i18n/fr_FR.csv
@@ -55,3 +55,7 @@ General,Général
 "Require <a href='https://github.com/elastic/elasticsearch-analysis-phonetic'>Phonetic analysis</a> plugin installation.","Nécessite l'installation du plugin <a href='https://github.com/elastic/elasticsearch-analysis-phonetic'>Phonetic analysis</a>."
 "Yes","Oui"
 "No","Non"
+"Maximum number of popular search terms to display in autocomplete results.","Nombre maximum de recherches populaires à afficher dans les résultats de l'autocomplétion."
+"Popular Term Autocomplete","Autocomplétion des recherches populaires"
+"Max size","Taille maximum"
+"Autocomplete","Autocomplétion"
diff --git a/src/module-elasticsuite-catalog-autocomplete/view/frontend/layout/default.xml b/src/module-elasticsuite-core/view/frontend/layout/default.xml
similarity index 70%
rename from src/module-elasticsuite-catalog-autocomplete/view/frontend/layout/default.xml
rename to src/module-elasticsuite-core/view/frontend/layout/default.xml
index 308a39b30..46d26e9ae 100644
--- a/src/module-elasticsuite-catalog-autocomplete/view/frontend/layout/default.xml
+++ b/src/module-elasticsuite-core/view/frontend/layout/default.xml
@@ -8,7 +8,7 @@
  *
  *
  * @category  Smile
- * @package   Smile_ElasticSuiteCatalogAutocomplete
+ * @package   Smile_ElasticSuiteCore
  * @author    Romain Ruaud <romain.ruaud@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
@@ -17,7 +17,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="header-wrapper">
-            <block class="Smile\ElasticSuiteCatalogAutocomplete\Block\Search\Form\Autocomplete" name="top.search" as="topSearch" template="Smile_ElasticSuiteCatalogAutocomplete::form.mini.phtml"/>
+            <block class="Smile\ElasticSuiteCore\Block\Search\Form\Autocomplete" name="top.search" as="topSearch" template="Smile_ElasticSuiteCore::search/form.mini.phtml"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/src/module-elasticsuite-catalog-autocomplete/view/frontend/requirejs-config.js b/src/module-elasticsuite-core/view/frontend/requirejs-config.js
similarity index 75%
rename from src/module-elasticsuite-catalog-autocomplete/view/frontend/requirejs-config.js
rename to src/module-elasticsuite-core/view/frontend/requirejs-config.js
index 30f8d2224..796983df3 100644
--- a/src/module-elasticsuite-catalog-autocomplete/view/frontend/requirejs-config.js
+++ b/src/module-elasticsuite-core/view/frontend/requirejs-config.js
@@ -6,7 +6,7 @@
  *
  *
  * @category  Smile
- * @package   Smile_ElasticSuiteCatalogAutocomplete
+ * @package   Smile_ElasticSuiteCore
  * @author    Romain Ruaud <romain.ruaud@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
@@ -16,7 +16,7 @@ var config = {
     map: {
         '*': {
             mageQuickSearch : 'Magento_Search/form-mini',
-            quickSearch: 'Smile_ElasticSuiteCatalogAutocomplete/js/form-mini'
+            quickSearch: 'Smile_ElasticSuiteCore/js/form-mini'
         }
     }
 };
diff --git a/src/module-elasticsuite-catalog-autocomplete/view/frontend/templates/form.mini.phtml b/src/module-elasticsuite-core/view/frontend/templates/search/form.mini.phtml
similarity index 95%
rename from src/module-elasticsuite-catalog-autocomplete/view/frontend/templates/form.mini.phtml
rename to src/module-elasticsuite-core/view/frontend/templates/search/form.mini.phtml
index af002b3a5..d7fdc9e65 100644
--- a/src/module-elasticsuite-catalog-autocomplete/view/frontend/templates/form.mini.phtml
+++ b/src/module-elasticsuite-core/view/frontend/templates/search/form.mini.phtml
@@ -7,7 +7,7 @@
  *
  *
  * @category  Smile
- * @package   Smile_ElasticSuiteCatalogAutocomplete
+ * @package   Smile_ElasticSuiteCore
  * @author    Romain Ruaud <romain.ruaud@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
@@ -17,7 +17,7 @@
  * Template for quick search mini form.
  * Overriden to manage template injection for the rendering of autocomplete results.
  *
- * @var $block \Smile\ElasticSuiteCatalogAutocomplete\Block\Search\Form\Mini
+ * @var $block \Smile\ElasticSuiteCore\Block\Search\Form\Mini
  */
 ?>
 
diff --git a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/css/source/_module.less b/src/module-elasticsuite-core/view/frontend/web/css/source/_module.less
similarity index 83%
rename from src/module-elasticsuite-catalog-autocomplete/view/frontend/web/css/source/_module.less
rename to src/module-elasticsuite-core/view/frontend/web/css/source/_module.less
index 00f42dd4f..039612dbc 100644
--- a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/css/source/_module.less
+++ b/src/module-elasticsuite-core/view/frontend/web/css/source/_module.less
@@ -6,34 +6,12 @@
 //  *
 //  *
 //  * @category  Smile
-//  * @package   Smile_ElasticSuiteCatalogAutocomplete
+//  * @package   Smile_ElasticSuiteCore
 //  * @author    Romain Ruaud <romain.ruaud@smile.fr>
 //  * @copyright 2016 Smile
 //  * @license   Open Software License ("OSL") v. 3.0
 //  */
 
-.smile-elasticsuite-autocomplete-result {
-    .product-image-box {
-        float: left;
-        padding: 0 5px;
-        width: 55px;
-    }
-
-    .product-shop {
-        float: left;
-        margin: 0 10px 0 0;
-        padding: 0;
-        white-space: normal;
-        width: 60%;
-    }
-
-    .product-item {
-        .price-box {
-            margin: 5px 0;
-        }
-    }
-}
-
 .search-autocomplete {
     position: absolute;
     z-index: 3;
diff --git a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/js/form-mini.js b/src/module-elasticsuite-core/view/frontend/web/js/form-mini.js
similarity index 97%
rename from src/module-elasticsuite-catalog-autocomplete/view/frontend/web/js/form-mini.js
rename to src/module-elasticsuite-core/view/frontend/web/js/form-mini.js
index 74d3ed0b1..91b071e41 100644
--- a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/js/form-mini.js
+++ b/src/module-elasticsuite-core/view/frontend/web/js/form-mini.js
@@ -40,7 +40,9 @@ define([
          */
         _initTemplates: function() {
             for (var template in this.options.templates) {
-                this._loadTemplate(template);
+                if ({}.hasOwnProperty.call(this.options.templates, template)) {
+                    this._loadTemplate(template);
+                }
             }
         },
 
@@ -203,7 +205,7 @@ define([
                     var sectionDropdown = this._getSectionHeader();
                     $.each(data, function(index, element) {
 
-                        if (!lastElement || (lastElement && lastElement.type != element.type)) {
+                        if (!lastElement || (lastElement && lastElement.type !== element.type)) {
                             sectionDropdown = this._getSectionHeader(element.type);
                         }
 
@@ -211,7 +213,7 @@ define([
 
                         sectionDropdown.append(elementHtml);
 
-                        if (!lastElement || (lastElement && lastElement.type != element.type)) {
+                        if (!lastElement || (lastElement && lastElement.type !== element.type)) {
                             content.append(sectionDropdown);
                         }
 
diff --git a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/template/autocomplete/term.html b/src/module-elasticsuite-core/view/frontend/web/template/autocomplete/term.html
similarity index 90%
rename from src/module-elasticsuite-catalog-autocomplete/view/frontend/web/template/autocomplete/term.html
rename to src/module-elasticsuite-core/view/frontend/web/template/autocomplete/term.html
index 622688123..69764fa54 100644
--- a/src/module-elasticsuite-catalog-autocomplete/view/frontend/web/template/autocomplete/term.html
+++ b/src/module-elasticsuite-core/view/frontend/web/template/autocomplete/term.html
@@ -7,7 +7,7 @@
 *
 *
 * @category  Smile
-* @package   Smile_ElasticSuiteCatalogAutocomplete
+* @package   Smile_ElasticSuiteCore
 * @author    Romain Ruaud <romain.ruaud@smile.fr>
 * @copyright 2016 Smile
 * @license   Open Software License ("OSL") v. 3.0