diff --git a/Block/Checkout/Conversion.php b/Block/Checkout/Conversion.php
new file mode 100644
index 000000000..c048d3c55
--- /dev/null
+++ b/Block/Checkout/Conversion.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Block\Checkout;
+
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Model\Order\Item;
+
+class Conversion extends Template
+{
+    /**
+     * @var Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var ConfigHelper
+     */
+    protected $configHelper;
+
+    /**
+     * @param Context $context
+     * @param Session $checkoutSession
+     * @param ConfigHelper $configHelper
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        Session $checkoutSession,
+        ConfigHelper $configHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->checkoutSession = $checkoutSession;
+        $this->configHelper = $configHelper;
+    }
+
+    protected function getOrderItems()
+    {
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->checkoutSession->getLastRealOrder();
+
+        return $order->getAllVisibleItems();
+    }
+
+    public function getOrderItemsConversionJson()
+    {
+        $orderItemsData = [];
+        $orderItems = $this->getOrderItems();
+
+        /** @var Item $item */
+        foreach ($orderItems as $item) {
+            if ($item->hasData('algoliasearch_query_param')) {
+                $orderItemsData[$item->getProductId()] = json_decode($item->getData('algoliasearch_query_param'));
+            }
+        }
+
+        return json_encode($orderItemsData);
+    }
+
+    public function toHtml()
+    {
+        $storeId = $this->checkoutSession->getLastRealOrder()->getStoreId();
+        if ($this->configHelper->isClickConversionAnalyticsEnabled($storeId)
+            && $this->configHelper->getConversionAnalyticsMode($storeId) === 'place_order'
+        ) {
+            return parent::toHtml();
+        }
+
+        return '';
+    }
+}
diff --git a/Model/Observer/ClickAnalytics/CatalogControllerProductInitBefore.php b/Model/Observer/ClickAnalytics/CatalogControllerProductInitBefore.php
new file mode 100644
index 000000000..7bd0dc120
--- /dev/null
+++ b/Model/Observer/ClickAnalytics/CatalogControllerProductInitBefore.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Model\Observer\ClickAnalytics;
+
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+class CatalogControllerProductInitBefore implements ObserverInterface
+{
+    protected $analyticsParams = [
+        'queryID',
+        'indexName',
+        'objectID',
+    ];
+
+    /** @var ConfigHelper */
+    private $configHelper;
+
+    /** @var CheckoutSession */
+    private $checkoutSession;
+
+    /**
+     * CatalogControllerProductInitBefore constructor.
+     *
+     * @param ConfigHelper $configHelper
+     * @param CheckoutSession $checkoutSession
+     */
+    public function __construct(
+        ConfigHelper $configHelper,
+        CheckoutSession $checkoutSession
+    ) {
+        $this->configHelper = $configHelper;
+        $this->checkoutSession = $checkoutSession;
+    }
+
+    /**
+     * @param array $params
+     *
+     * @return bool
+     */
+    protected function hasRequiredParameters($params = [])
+    {
+        foreach ($this->analyticsParams as $requiredParam) {
+            if (!isset($params[$requiredParam])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function execute(Observer $observer)
+    {
+        $controllerAction = $observer->getEvent()->getControllerAction();
+        $params = $controllerAction->getRequest()->getParams();
+
+        $storeID = $this->checkoutSession->getQuote()->getStoreId();
+        if ($this->hasRequiredParameters($params)
+            && $this->configHelper->isClickConversionAnalyticsEnabled($storeID)
+            && $this->configHelper->getConversionAnalyticsMode($storeID) === 'place_order'
+        ) {
+            $conversionData = [
+                'queryID' => $params['queryID'],
+                'indexName' => $params['indexName'],
+                'objectID' => $params['objectID'],
+            ];
+
+            $this->checkoutSession->setData('algoliasearch_query_param', json_encode($conversionData));
+        }
+    }
+}
diff --git a/Model/Observer/ClickAnalytics/CheckoutCartProductAddAfter.php b/Model/Observer/ClickAnalytics/CheckoutCartProductAddAfter.php
new file mode 100644
index 000000000..4218746d9
--- /dev/null
+++ b/Model/Observer/ClickAnalytics/CheckoutCartProductAddAfter.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Model\Observer\ClickAnalytics;
+
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+class CheckoutCartProductAddAfter implements ObserverInterface
+{
+    /** @var ConfigHelper */
+    private $configHelper;
+
+    /** @var CheckoutSession */
+    private $checkoutSession;
+
+    /**
+     * CatalogControllerProductInitBefore constructor.
+     *
+     * @param ConfigHelper $configHelper
+     * @param CheckoutSession $checkoutSession
+     */
+    public function __construct(
+        ConfigHelper $configHelper,
+        CheckoutSession $checkoutSession
+    ) {
+        $this->configHelper = $configHelper;
+        $this->checkoutSession = $checkoutSession;
+    }
+
+    /**
+     * @param Observer $observer
+     */
+    public function execute(Observer $observer)
+    {
+        /** @var \Magento\Quote\Model\Quote\Item $quoteItem */
+        $quoteItem = $observer->getEvent()->getQuoteItem();
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $observer->getEvent()->getProduct();
+
+        if ($this->configHelper->isClickConversionAnalyticsEnabled($product->getStoreId())
+            && $this->configHelper->getConversionAnalyticsMode($product->getStoreId()) === 'place_order'
+        ) {
+            $quoteItem->setData('algoliasearch_query_param', $this->checkoutSession->getData('algoliasearch_query_param'));
+        }
+    }
+}
diff --git a/Model/ResourceModel/Query/Grid/Collection.php b/Model/ResourceModel/Query/Grid/Collection.php
index aec716203..63634ff8a 100644
--- a/Model/ResourceModel/Query/Grid/Collection.php
+++ b/Model/ResourceModel/Query/Grid/Collection.php
@@ -13,7 +13,6 @@ class Collection extends QueryCollection implements SearchResultInterface
 
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
-     * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param mixed|null $mainTable
diff --git a/Plugin/QuoteItem.php b/Plugin/QuoteItem.php
new file mode 100644
index 000000000..21be9257a
--- /dev/null
+++ b/Plugin/QuoteItem.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Plugin;
+
+use Algolia\AlgoliaSearch\Helper\ConfigHelper;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Quote\Model\Quote\Item\ToOrderItem;
+use Magento\Sales\Api\Data\OrderItemInterface;
+
+class QuoteItem
+{
+    /** @var ConfigHelper */
+    private $configHelper;
+
+    /**
+     * QuoteItem constructor.
+     *
+     * @param ConfigHelper $configHelper
+     */
+    public function __construct(ConfigHelper $configHelper)
+    {
+        $this->configHelper = $configHelper;
+    }
+
+    /**
+     * @param ToOrderItem $subject
+     * @param OrderItemInterface $orderItem
+     * @param AbstractItem $item
+     * @param array $additional
+     *
+     * @return OrderItemInterface
+     */
+    public function afterConvert(
+        ToOrderItem $subject,
+        OrderItemInterface $orderItem,
+        AbstractItem $item,
+        $additional = []
+    ) {
+        $product = $item->getProduct();
+        if ($this->configHelper->isClickConversionAnalyticsEnabled($product->getStoreId())
+            && $this->configHelper->getConversionAnalyticsMode($product->getStoreId()) === 'place_order'
+        ) {
+            $orderItem->setData('algoliasearch_query_param', $item->getData('algoliasearch_query_param'));
+        }
+
+        return $orderItem;
+    }
+}
diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
new file mode 100644
index 000000000..74ea22e0e
--- /dev/null
+++ b/Setup/UpgradeData.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Setup;
+
+use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Quote\Setup\QuoteSetupFactory;
+use Magento\Sales\Setup\SalesSetupFactory;
+
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * @var QuoteSetupFactory
+     */
+    private $quoteSetupFactory;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    public function __construct(
+        QuoteSetupFactory $quoteSetupFactory,
+        SalesSetupFactory $salesSetupFactory
+    ) {
+        $this->quoteSetupFactory = $quoteSetupFactory;
+        $this->salesSetupFactory = $salesSetupFactory;
+    }
+    /**
+     * @param ModuleDataSetupInterface $setup
+     * @param ModuleContextInterface $context
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        // beware, this is the version we are upgrading from, not to!
+        $moduleVersion = $context->getVersion();
+
+        if (version_compare($moduleVersion, '2.0.0', '<')) {
+            /** @var \Magento\Quote\Setup\QuoteSetup $quoteSetup */
+            $quoteSetup = $this->quoteSetupFactory->create(['resourceName' => 'quote_setup', 'setup' => $setup]);
+            $quoteSetup->addAttribute(
+                'quote_item',
+                'algoliasearch_query_param',
+                [
+                    'type' => TABLE::TYPE_TEXT,
+                    'nullable' => true,
+                    'comment' => 'Reference for Algolia analytics order conversion',
+                ]
+            );
+
+            /** @var \Magento\Sales\Setup\SalesSetup $salesSetup */
+            $salesSetup = $this->salesSetupFactory->create(['resourceName' => 'sales_setup', 'setup' => $setup]);
+            $salesSetup->addAttribute(
+                'order_item',
+                'algoliasearch_query_param',
+                [
+                    'type' => TABLE::TYPE_TEXT,
+                    'nullable' => true,
+                    'comment' => 'Reference for Algolia analytics order conversion',
+                ]
+            );
+        }
+    }
+}
diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
index c9baa31d0..1b9762248 100644
--- a/Setup/UpgradeSchema.php
+++ b/Setup/UpgradeSchema.php
@@ -76,7 +76,7 @@ class UpgradeSchema implements UpgradeSchemaInterface
         'algoliasearch_queue/queue/number_of_retries' => '3',
 
         'algoliasearch_cc_analytics/cc_analytics_group/enable' => '0',
-        'algoliasearch_cc_analytics/cc_analytics_group/is_selector' => '.ais-hits--item a.result, .ais-infinite-hits--item a.result',
+        'algoliasearch_cc_analytics/cc_analytics_group/is_selector' => '.ais-Hits-item a.result, .ais-InfiniteHits-item a.result',
         'algoliasearch_cc_analytics/cc_analytics_group/enable_conversion_analytics' => 'disabled',
         'algoliasearch_cc_analytics/cc_analytics_group/add_to_cart_selector' => '.action.primary.tocart',
 
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index dc99496e0..fad5c7ccd 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -655,7 +655,7 @@
                     <label>DOM selector of a result container on the instant search page</label>
                     <comment>
                         <![CDATA[
-                            The element must contain attributes <code>data-objectid</code> and <code>data-position</code>.
+                            The element must contain attributes <code>data-objectid</code>, <code>data-indexname</code>, <code>data-position</code>, and <code>data-queryid</code>.
                         ]]>
                     </comment>
                     <depends>
diff --git a/etc/di.xml b/etc/di.xml
index f9f6c2c1d..f0ea803fb 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -104,4 +104,9 @@
             <argument name="imageUploader" xsi:type="object">Algolia\AlgoliaSearch\QueryImageUpload</argument>
         </arguments>
     </type>    
+    
+    <!-- Click and Conversion Analytics -->
+    <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
+        <plugin name="algoliasearch_query_quote_item_conversion" type="Algolia\AlgoliaSearch\Plugin\QuoteItem"/>
+    </type>
 </config>
diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
index 9cecd3ceb..fda41bf6e 100755
--- a/etc/frontend/events.xml
+++ b/etc/frontend/events.xml
@@ -6,4 +6,12 @@
     <event name="algolia_get_attributes_to_filter">
         <observer name="algoliasearch_apply_product_permissions" instance="Algolia\AlgoliaSearch\Model\Observer\CatalogPermissions\ApplyProductPermissionsFilter" />
     </event>
+
+    <!-- Click and Conversion Analytics -->
+    <event name="catalog_controller_product_init_before">
+        <observer name="algoliasearch_set_parameters_to_session" instance="Algolia\AlgoliaSearch\Model\Observer\ClickAnalytics\CatalogControllerProductInitBefore" />
+    </event>
+    <event name="checkout_cart_product_add_after">
+        <observer name="algoliasearch_add_request_to_quote_item" instance="Algolia\AlgoliaSearch\Model\Observer\ClickAnalytics\CheckoutCartProductAddAfter" />
+    </event>
 </config>
\ No newline at end of file
diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml
new file mode 100644
index 000000000..63df7951a
--- /dev/null
+++ b/view/frontend/layout/checkout_onepage_success.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="order.success.additional.info">
+            <block ifconfig="algoliasearch_cc_analytics/cc_analytics_group/enable"
+                   class="Algolia\AlgoliaSearch\Block\Checkout\Conversion"
+                   name="algoliasearch.analytics.order.conversion"
+                   template="Algolia_AlgoliaSearch::checkout/conversion.phtml"
+                   after="-">
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/frontend/templates/autocomplete/product.phtml b/view/frontend/templates/autocomplete/product.phtml
index 95f25f302..aa9250fae 100644
--- a/view/frontend/templates/autocomplete/product.phtml
+++ b/view/frontend/templates/autocomplete/product.phtml
@@ -10,7 +10,10 @@ $tierFormatedVar = 'price' . $priceKey . '_tier_formated'
 
 <!-- Product hit template -->
 <script type="text/template" id="autocomplete_products_template">
-    <a class="algoliasearch-autocomplete-hit" href="{{url}}">
+    <a class="algoliasearch-autocomplete-hit"
+        {{^__queryID}} href="{{url}}" {{/__queryID}}
+        {{#__queryID}} href="{{urlForInsights}}" {{/__queryID}}
+    >
         {{#thumbnail_url}}
         <div class="thumb"><img src="{{thumbnail_url}}" alt="{{{name}}}" /></div>
         {{/thumbnail_url}}
@@ -55,4 +58,4 @@ $tierFormatedVar = 'price' . $priceKey . '_tier_formated'
             </div>
         </div>
     </a>
-</script>
\ No newline at end of file
+</script>
diff --git a/view/frontend/templates/checkout/conversion.phtml b/view/frontend/templates/checkout/conversion.phtml
new file mode 100644
index 000000000..f604b4672
--- /dev/null
+++ b/view/frontend/templates/checkout/conversion.phtml
@@ -0,0 +1,8 @@
+<?php
+/** @var \Algolia\AlgoliaSearch\Block\Checkout\Conversion $block */
+$orderItemsJson = $block->getOrderItemsConversionJson();
+?>
+
+<script type="text/javascript">
+    var algoliaOrderConversionJson = <?php echo $orderItemsJson ?>;
+</script>
\ No newline at end of file
diff --git a/view/frontend/templates/instant/hit.phtml b/view/frontend/templates/instant/hit.phtml
index 8d894b0c4..e910715e2 100644
--- a/view/frontend/templates/instant/hit.phtml
+++ b/view/frontend/templates/instant/hit.phtml
@@ -12,7 +12,14 @@ $tierFormatedVar = 'price' . $priceKey . '_tier_formated'
 <script type="text/template" id="instant-hit-template">
     <div class="col-md-4 col-sm-6">
         <div class="result-wrapper" itemprop="itemListElement" itemscope itemtype="http://schema.org/Product">
-            <a itemprop="url" href="{{url}}" class="result" data-objectid="{{objectID}}" data-position="{{__position}}" data-queryid={{__queryid}}>
+            <a itemprop="url"
+                class="result"
+                {{^__queryID}} href="{{url}}" {{/__queryID}}
+                {{#__queryID}} href="{{urlForInsights}}" {{/__queryID}}
+                data-objectid="{{objectID}}"
+                data-indexname="{{__indexName}}"
+                data-position="{{__position}}"
+                data-queryid="{{__queryID}}">
                 <div class="result-content">
                     <div class="result-thumbnail">
                         {{#image_url}}<img itemprop="image" src="{{{image_url}}}" alt="{{{name}}}" />{{/image_url}}
@@ -67,7 +74,12 @@ $tierFormatedVar = 'price' . $priceKey . '_tier_formated'
                             <input type="hidden" name="product" value="{{objectID}}">
                             <input type="hidden" name="uenc" value="{{ addToCart.uenc }}">
                             <input name="form_key" type="hidden" value="{{ addToCart.formKey }}">
-                            <button type="submit" title="<?php echo __('Add to Cart') ?>" class="action tocart primary" data-objectid="{{objectID}}" data-position="{{__position}}">
+                            <button type="submit" title="<?php echo __('Add to Cart') ?>" class="action tocart primary"
+                            data-objectid="{{objectID}}"
+                            data-indexname="{{__indexName}}"
+                            data-position="{{__position}}"
+                            data-queryid="{{__queryID}}"
+                            >
                                 <span><?php echo __('Add to Cart') ?></span>
                             </button>
                         </form>
diff --git a/view/frontend/web/click_conversion_analytics.js b/view/frontend/web/click_conversion_analytics.js
index b3091dbba..5a6b2410c 100644
--- a/view/frontend/web/click_conversion_analytics.js
+++ b/view/frontend/web/click_conversion_analytics.js
@@ -1,90 +1,103 @@
-requirejs(['algoliaBundle', 'algoliaAnalytics'], function(algoliaBundle, algoliaAnalytics) {
+requirejs(['algoliaBundle', 'algoliaAnalytics'], function (algoliaBundle, algoliaAnalytics) {
 	algoliaBundle.$(function ($) {
 		algoliaAnalytics.init({
-			applicationID: algoliaConfig.applicationId,
+			appId: algoliaConfig.applicationId,
 			apiKey: algoliaConfig.apiKey
 		});
-		
+		var userAgent = 'insights-js-in-magento (' + window.algoliaConfig.extensionVersion + ')';
+		algoliaAnalytics.addAlgoliaAgent(userAgent);
+
 		// "Click" in autocomplete
 		$(algoliaConfig.autocomplete.selector).each(function () {
 			$(this).on('autocomplete:selected', function (e, suggestion) {
-				trackClick(suggestion.objectID, suggestion.__position, suggestion.__queryID);
+				trackClick(suggestion.objectID, suggestion.__position, suggestion.__queryID, suggestion.__indexName);
 			});
 		});
-		
+
 		// "Click" on instant search page
-		$(document).on('click', algoliaConfig.ccAnalytics.ISSelector, function() {
+		$(document).on('click', algoliaConfig.ccAnalytics.ISSelector, function () {
 			var $this = $(this);
-			
-			trackClick($this.data('objectid'), $this.data('position'));
+
+			trackClick($this.data('objectid'), $this.data('position'), $this.data('queryid'), $this.data('indexname'));
 		});
-		
+
 		// "Add to cart" conversion
 		if (algoliaConfig.ccAnalytics.conversionAnalyticsMode === 'add_to_cart') {
+			function getQueryParamFromCurrentUrl(queryParamName) {
+				var url = window.location.href;
+				var regex = new RegExp('[?&]' + queryParamName + '(=([^&#]*)|&|#|$)');
+				var results = regex.exec(url);
+				if (!results || !results[2]) return '';
+				return results[2];
+			}
+
 			$(document).on('click', algoliaConfig.ccAnalytics.addToCartSelector, function () {
-				var objectId = $(this).data('objectid') || algoliaConfig.productId;
-				
-				if (!objectId) {
-					var postData = $(this).data('post');
-					if (!postData || !postData.data.product) {
-						return;
-					}
-					
-					objectId = postData.data.product;
-				}
-				
-				// "setTimeout" ensures "trackConversion" is always triggered AFTER "trackClick"
-				// when clicking "Add to cart" on instant search results page
-				setTimeout(function () {
-					trackConversion(objectId);
-				}, 0);
+				var objectId = $(this).data('objectid') || getQueryParamFromCurrentUrl('indexName');
+				var queryID = $(this).data('queryid') || getQueryParamFromCurrentUrl('queryID');
+				var indexName = $(this).data('queryid') || getQueryParamFromCurrentUrl('indexName');
+
+				// FIXME: what is this code for? removing it for now
+				// if (!objectId) {
+				// 	var postData = $(this).data('post');
+				// 	if (!postData || !postData.data.product) {
+				// 		return;
+				// 	}
+				//
+				// 	objectId = postData.data.product;
+				// }
+
+				trackConversion(objectId, queryID, indexName);
 			});
 		}
-		
-		// "Place order" conversions
-		// "algoliaConfig.ccAnalytics.orderedProductIds" are set only on checkout success page
-		if (algoliaConfig.ccAnalytics.conversionAnalyticsMode === 'place_order'
-			&& algoliaConfig.ccAnalytics.orderedProductIds.length > 0) {
-			$.each(algoliaConfig.ccAnalytics.orderedProductIds, function (i, objectId) {
-				trackConversion(objectId);
-			});
+
+
+		if (algoliaConfig.ccAnalytics.conversionAnalyticsMode === 'place_order') {
+
+			if (typeof algoliaOrderConversionJson !== 'undefined') {
+				$.each(algoliaOrderConversionJson, function(idx, itemData) {
+					if (itemData !== null && typeof itemData.queryID !== 'undefined') {
+						trackConversion(itemData.objectID, itemData.queryID, itemData.indexName);
+					}
+				});
+			}
 		}
+
 	});
-	
-	algolia.registerHook('beforeInstantsearchInit', function (instantsearchOptions, algoliaBundle) {
+
+	algolia.registerHook('beforeInstantsearchInit', function (instantsearchOptions) {
 		instantsearchOptions.searchParameters['clickAnalytics'] = true;
-		
+
 		return instantsearchOptions;
 	});
-	
-	algolia.registerHook('beforeInstantsearchStart', function (search, algoliaBundle) {
-		search.once('render', function() {
-			algoliaAnalytics.initSearch({
-				getQueryID: function() {
-					return search.helper.lastResults && search.helper.lastResults._rawResults[0].queryID
-				}
-			});
-		});
-		
-		return search;
-	});
-	
-	function trackClick(objectID, position, queryId) {
+
+	function trackClick(objectID, position, queryID, indexName) {
 		var clickData = {
-			objectID: objectID.toString(),
-			position: parseInt(position)
+			eventName: 'Clicked',
+			objectIDs: [objectID + ''],
+			positions: [parseInt(position)],
+			index: indexName,
 		};
-		
-		if (queryId) {
-			clickData.queryID = queryId;
+
+		if (queryID) {
+			clickData.queryID = queryID;
+			algoliaAnalytics.clickedObjectIDsAfterSearch(clickData);
+		} else {
+			algoliaAnalytics.clickedObjectIDs(clickData);
 		}
-		
-		algoliaAnalytics.click(clickData);
 	}
-	
-	function trackConversion(objectID) {
-		algoliaAnalytics.conversion({
-			objectID: objectID.toString()
-		});
+
+	function trackConversion(objectID, queryID, indexName) {
+		var conversionData = {
+			eventName: 'Added to cart',
+			objectIDs: [objectID + ''],
+			index: indexName
+		};
+
+		if (queryID) {
+			conversionData.queryID = queryID;
+			algoliaAnalytics.convertedObjectIDsAfterSearch(conversionData);
+		} else {
+			algoliaAnalytics.convertedObjectIDs(conversionData);
+		}
 	}
 });
diff --git a/view/frontend/web/instantsearch.js b/view/frontend/web/instantsearch.js
index 52f6b2270..671057260 100644
--- a/view/frontend/web/instantsearch.js
+++ b/view/frontend/web/instantsearch.js
@@ -351,10 +351,10 @@ requirejs(['algoliaBundle', 'Magento_Catalog/js/price-utils'], function (algolia
 				},
 				transformItems: function (items) {
 					return items.map(function (item) {
+						item.__indexName = search.helper.lastResults.index;
 						item = transformHit(item, algoliaConfig.priceKey, search.helper);
 						// FIXME: transformHit is a global
 						item.isAddToCartEnabled = algoliaConfig.instant.isAddToCartEnabled;
-						item.algoliaConfig = window.algoliaConfig;
 						return item;
 					});
 				},
@@ -378,6 +378,7 @@ requirejs(['algoliaBundle', 'Magento_Catalog/js/price-utils'], function (algolia
 				},
 				transformItems: function (items) {
 					return items.map(function (item) {
+						item.__indexName = search.helper.lastResults.index;
 						item = transformHit(item, algoliaConfig.priceKey, search.helper);
 						// FIXME: transformHit is a global
 						item.isAddToCartEnabled = algoliaConfig.instant.isAddToCartEnabled;
diff --git a/view/frontend/web/internals/common.js b/view/frontend/web/internals/common.js
index d51a0ad6e..edfe57326 100644
--- a/view/frontend/web/internals/common.js
+++ b/view/frontend/web/internals/common.js
@@ -175,6 +175,19 @@ requirejs(['algoliaBundle'], function(algoliaBundle) {
 				'formKey': algoliaConfig.instant.addToCartParams.formKey
 			};
 
+			if (hit.__queryID) {
+				var insightsDataUrlString = $.param({
+					queryID: hit.__queryID,
+					objectID: hit.objectID,
+					indexName: hit.__indexName
+				});
+				if (hit.url.indexOf('?') > -1) {
+					hit.urlForInsights = hit.url + insightsDataUrlString
+				} else {
+					hit.urlForInsights = hit.url + '?' + insightsDataUrlString;
+				}
+			}
+
 			return hit;
 		};
 
@@ -222,13 +235,14 @@ requirejs(['algoliaBundle'], function(algoliaBundle) {
 							return template;
 						},
 						suggestion: function (hit, payload) {
+							hit.__indexName = algoliaConfig.indexName + "_" + section.name;
+							hit.__queryID = payload.queryID;
+							hit.__position = payload.hits.indexOf(hit) + 1;
+
 							hit = transformHit(hit, algoliaConfig.priceKey);
 
 							hit.displayKey = hit.displayKey || hit.name;
 
-							hit.__queryID = payload.queryID;
-							hit.__position = payload.hits.indexOf(hit) + 1;
-
 							return algoliaConfig.autocomplete.templates[section.name].render(hit);
 						}
 					}
diff --git a/view/frontend/web/internals/search-insights.js b/view/frontend/web/internals/search-insights.js
index 186687cd5..2826a7fae 100644
--- a/view/frontend/web/internals/search-insights.js
+++ b/view/frontend/web/internals/search-insights.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.AlgoliaAnalytics=t()}(this,function(){"use strict";var e,t,n,r,i=function(){var e=this;if(this.storeClick=function(t,n){var r=JSON.parse(localStorage.getItem("insights-store"))||{};r[t]={queryID:n,eventTimestamp:(new Date).getTime()},localStorage.setItem(e._storageKey,JSON.stringify(r))},this.getConversionObjectID=function(t){var n=e.getStorageData()[t];return n||!1},this.cleanOldStorage=function(e,t){var n=Object.keys(t);return n.length>0?n.reduce(function(n,r){var i=t[r];return Math.abs(e-i.eventTimestamp)/36e5<=6&&(n[r]=i),n},{}):{}},this.getStorageData=function(){return JSON.parse(localStorage.getItem("insights-store"))||{}},!function(e){try{var t=window[e],n="__storage_test__";return t.setItem(n,n),t.removeItem(n),!0}catch(e){return e instanceof DOMException&&(22===e.code||1014===e.code||"QuotaExceededError"===e.name||"NS_ERROR_DOM_QUOTA_REACHED"===e.name)&&0!==t.length}}("localStorage"))throw new Error("LocalStorage is not available");this._storageKey="insights-store";var t=(new Date).getTime(),n=this.getStorageData(),r=this.cleanOldStorage(t,n);localStorage.setItem(this._storageKey,JSON.stringify(r))},o=function(e,t,n){var r=new Date;r.setTime(r.getTime()+24*n*60*60*1e3);var i="expires="+r.toUTCString();document.cookie=e+"="+t+";"+i+";path=/"},a=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(e){var t=16*Math.random()|0;return("x"==e?t:3&t|8).toString(16)})},s=function(e){var t=function(e){for(var t=e+"=",n=decodeURIComponent(document.cookie).split(";"),r=0;r<n.length;r++){for(var i=n[r];" "==i.charAt(0);)i=i.substring(1);if(0==i.indexOf(t))return i.substring(t.length,i.length)}return""}("_ALGOLIA");if(t&&""!==t)return o("_ALGOLIA",t,10),t;var n=a();return o("_ALGOLIA",n,10),n};Object.keys||(Object.keys=(e=Object.prototype.hasOwnProperty,t=!{toString:null}.propertyIsEnumerable("toString"),r=(n=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"]).length,function(i){if("function"!=typeof i&&("object"!=typeof i||null===i))throw new TypeError("Object.keys called on non-object");var o,a,s=[];for(o in i)e.call(i,o)&&s.push(o);if(t)for(a=0;a<r;a++)e.call(i,n[a])&&s.push(n[a]);return s})),"function"!=typeof Object.assign&&Object.defineProperty(Object,"assign",{value:function(e,t){var n=arguments;if(null==e)throw new TypeError("Cannot convert undefined or null to object");for(var r=Object(e),i=1;i<arguments.length;i++){var o=n[i];if(null!=o)for(var a in o)Object.prototype.hasOwnProperty.call(o,a)&&(r[a]=o[a])}return r},writable:!0,configurable:!0});return new function(e){if(this._hasCredentials=!1,!document.addEventListener||!window)throw new Error("Browser does not support eventlistener or there is no window object.");this.storageManager=new i,this.processQueue=function(){var e=this,t=window.AlgoliaAnalyticsObject;t&&((window[t].queue||[]).forEach(function(t){var n=t[0],r=t[1];n&&"function"==typeof e[n]&&e[n](r)}),window[t]=function(t,n){e[t](n)})}.bind(this),this.sendEvent=function(e,t){var n=this;t.timestamp=Date.now(),t.userID=this._userID;var r="https://insights.algolia.io/1/searches/"+e+"?X-Algolia-Application-Id="+this._applicationID+"&X-Algolia-API-Key="+this._apiKey;if(navigator&&"function"==typeof navigator.sendBeacon&&"search"!==e)navigator.sendBeacon(r,JSON.stringify(t));else{var i=new XMLHttpRequest;i.open("POST",r),"search"===e&&(i.onreadystatechange=function(){if(4===i.readyState&&i.responseText){var e=i&&i.responseText?JSON.parse(i.responseText):{};n._lastQueryID=e.queryID}}),i.send(JSON.stringify(t))}}.bind(this),this.init=function(e){if(!e)throw new Error("Init function should be called with an object argument containing your apiKey and applicationID");if(!e.apiKey||"string"!=typeof e.apiKey)throw new Error("apiKey is missing, please provide it so we can authenticate the application");if(!e.applicationID||"string"!=typeof e.applicationID)throw new Error("applicationID is missing, please provide it, so we can properly attribute data to your application");this._apiKey=e.apiKey,this._applicationID=e.applicationID,this._hasCredentials=!0}.bind(this),this.initSearch=function(e){if(!this._hasCredentials)throw new Error("Before calling any methods on the analytics, you first need to call the 'init' function with applicationID and apiKey parameters");if(!e)throw new Error("initSearch function requires an argument with getQueryID and hitsContainer arguments");if(!e.getQueryID||"function"!=typeof e.getQueryID)throw new Error("getQueryID must be a function that returns the queryID of the last search operation");this.getQueryID=e.getQueryID}.bind(this),this.click=function(e){if(!this._hasCredentials)throw new Error("Before calling any methods on the analytics, you first need to call the 'init' function with applicationID and apiKey parameters");if(!e)throw new Error("No params were sent to click function, please provide an objectID and position to be reported");if(!e.objectID)throw new Error("required objectID parameter was not sent, click event can not be properly attributed");if(!e.position)throw new Error("required position parameter was not sent, click event position can not be properly sent without");var t=e.queryID;if("function"!=typeof this.getQueryID||t||(t=this.getQueryID()||this._lastQueryID),!t)throw new Error("No queryID was retrieved, please check the implementation and provide either a getQueryID function\n    or calls the search method that will return the queryID");this.storageManager.storeClick(e.objectID,t);var n=Object.assign({},e,{queryID:t});this.sendEvent("click",n)}.bind(this),this.conversion=function(e){if(!this._hasCredentials)throw new Error("Before calling any methods on the analytics, you first need to call the 'init' function with applicationID and apiKey parameters");if(!e)throw new Error("No parameters were sent to conversion event, please provide an objectID");if(!e.objectID)throw new Error("No objectID was sent to conversion event, please provide an objectID");var t=this.storageManager.getConversionObjectID(e.objectID),n=Object.assign(e,{queryID:t.queryID});if(!t)return!1;this.sendEvent("conversion",n)}.bind(this),this.search=function(e){if(!e)throw new Error("Search functions has to be called with a query string, which cannot be undefined");if(!e.index)throw new Error("Please provide index of the index being searched");this.sendEvent("search",e)}.bind(this),this._userID=s(),this.processQueue()}});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.AlgoliaAnalytics=t()}(this,function(){"use strict";var e=function(e){return void 0===e},t=function(e){return"string"==typeof e},r=function(e){return"number"==typeof e},o=function(e){return"function"==typeof e};function n(n,i){if(!this._userHasOptedOut){if(!this._hasCredentials)throw new Error("Before calling any methods on the analytics, you first need to call the 'init' function with appId and apiKey parameters");if(!t(i.index))throw TypeError("expected required parameter `index` to be a string");if(!t(i.eventName))throw TypeError("expected required parameter `eventName` to be a string");if(!e(i.userToken)&&!t(i.userToken))throw TypeError("expected optional parameter `userToken` to be a string");var s={eventType:n,eventName:i.eventName,userToken:i.userToken||this._userToken,index:i.index};if(!e(i.timestamp)){if(!r(i.timestamp))throw TypeError("expected optional parameter `timestamp` to be a number");s.timestamp=i.timestamp}if(!e(i.queryID)){if(!t(i.queryID))throw TypeError("expected optional parameter `queryID` to be a string");s.queryID=i.queryID}if(!e(i.objectIDs)){if(!Array.isArray(i.objectIDs))throw TypeError("expected optional parameter `objectIDs` to be an array");s.objectIDs=i.objectIDs}if(!e(i.positions)){if(!Array.isArray(i.positions))throw TypeError("expected optional parameter `positions` to be an array");if(e(i.objectIDs))throw new Error("cannot use `positions` without providing `objectIDs`");if(i.objectIDs.length!==i.positions.length)throw new Error("objectIDs and positions need to be of the same size");s.positions=i.positions}if(!e(i.filters)){if(!e(i.objectIDs))throw new Error("cannot use `objectIDs` and `filters` for the same event");if(!Array.isArray(i.filters))throw TypeError("expected optional parameter `filters` to be an array");s.filters=i.filters}if(e(i.objectIDs)&&e(i.filters))throw new Error("expected either `objectIDs` or `filters` to be provided");!function(e,t,r,n,i){var s=n+"/1/events?X-Algolia-Application-Id="+e+"&X-Algolia-API-Key="+t+"&X-Algolia-Agent="+r,a=navigator&&o(navigator.sendBeacon),c={events:i};if(a)navigator.sendBeacon(s,JSON.stringify(c));else{var p=new XMLHttpRequest;p.open("POST",s),p.send(JSON.stringify(c))}}(this._appId,this._apiKey,this._uaURIEncoded,this._endpointOrigin,[s])}}var i="insights-js (1.2.2)";var s=["de","us"],a=2592e6;var c,p,u,h,f=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(e){var t=16*Math.random()|0;return("x"===e?t:3&t|8).toString(16)})},d="_ALGOLIA",l=function(e,t,r){var o=new Date;o.setTime(o.getTime()+r);var n="expires="+o.toUTCString();document.cookie=e+"="+t+";"+n+";path=/"},w=function(e){for(var t=e+"=",r=decodeURIComponent(document.cookie).split(";"),o=0;o<r.length;o++){for(var n=r[o];" "===n.charAt(0);)n=n.substring(1);if(0===n.indexOf(t))return n.substring(t.length,n.length)}return""},b="ANONYMOUS_USER_TOKEN";Object.keys||(Object.keys=(c=Object.prototype.hasOwnProperty,p=!{toString:null}.propertyIsEnumerable("toString"),h=(u=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"]).length,function(e){if("function"!=typeof e&&("object"!=typeof e||null===e))throw new TypeError("Object.keys called on non-object");var t,r,o=[];for(t in e)c.call(e,t)&&o.push(t);if(p)for(r=0;r<h;r++)c.call(e,u[r])&&o.push(u[r]);return o})),"function"!=typeof Object.assign&&(Object.assign=function(e,t){var r=arguments;if(null==e)throw new TypeError("Cannot convert undefined or null to object");for(var o=Object(e),n=1;n<arguments.length;n++){var i=r[n];if(null!=i)for(var s in i)Object.prototype.hasOwnProperty.call(i,s)&&(o[s]=i[s])}return o});return new function(c){this._ua="",this._uaURIEncoded="",this.version="1.2.2",this._hasCredentials=!1,this.processQueue=function(e){var t=this,r=e.AlgoliaAnalyticsObject;if(r){var n=function(e){for(var r,n=[],i=arguments.length-1;i-- >0;)n[i]=arguments[i+1];e&&o(t[e])&&(r=t)[e].apply(r,n)},i=e[r];i.queue=i.queue||[];var s=i.queue;s.forEach(function(e){var t=[].slice.call(e),r=t[0],o=t.slice(1);n.apply(void 0,[r].concat(o))}),s.push=function(e){var t=[].slice.call(e),r=t[0],o=t.slice(1);n.apply(void 0,[r].concat(o))}}}.bind(this),this.sendEvent=n.bind(this),this.init=function(o){if(!o)throw new Error("Init function should be called with an object argument containing your apiKey and appId");if(e(o.apiKey)||!t(o.apiKey))throw new Error("apiKey is missing, please provide it so we can authenticate the application");if(e(o.appId)||!t(o.appId))throw new Error("appId is missing, please provide it, so we can properly attribute data to your application");if(!e(o.region)&&-1===s.indexOf(o.region))throw new Error("optional region is incorrect, please provide either one of: "+s.join(", ")+".");if(!(e(o.cookieDuration)||r(o.cookieDuration)&&isFinite(o.cookieDuration)&&Math.floor(o.cookieDuration)===o.cookieDuration))throw new Error("optional cookieDuration is incorrect, expected an integer.");this._apiKey=o.apiKey,this._appId=o.appId,this._userHasOptedOut=!!o.userHasOptedOut,this._region=o.region,this._endpointOrigin=o.region?"https://insights."+o.region+".algolia.io":"https://insights.algolia.io",this._cookieDuration=o.cookieDuration?o.cookieDuration:6*a,this._hasCredentials=!0,this._ua=i,this._uaURIEncoded=encodeURIComponent(i)}.bind(this),this.initSearch=function(e){if(!this._hasCredentials)throw new Error("Before calling any methods on the analytics, you first need to call the 'init' function with appId and apiKey parameters");if(!e)throw new Error("initSearch function requires an argument with getQueryID and hitsContainer arguments");if(!e.getQueryID||"function"!=typeof e.getQueryID)throw new Error("getQueryID must be a function that returns the queryID of the last search operation");this.getQueryID=e.getQueryID}.bind(this),this.addAlgoliaAgent=function(e){-1===this._ua.indexOf("; "+e)&&(this._ua+="; "+e,this._uaURIEncoded=encodeURIComponent(this._ua))}.bind(this),this.ANONYMOUS_USER_TOKEN=b,this.setUserToken=function(e){if(e===b){var t=w(d);t&&""!==t&&0===t.indexOf("anonymous-")?this._userToken=t:(this._userToken="anonymous-"+f(),l(d,this._userToken,this._cookieDuration))}else this._userToken=e}.bind(this),this.getUserToken=function(e,t){return o(t)&&t(null,this._userToken),this._userToken}.bind(this),this.clickedObjectIDsAfterSearch=function(e){if(!e)throw new Error("No params were sent to clickedObjectIDsAfterSearch function, please provide `queryID`,  `objectIDs` and `positions` to be reported");if(!e.queryID)throw new Error("required queryID parameter was not sent, click event can not be properly sent without");if(!e.objectIDs)throw new Error("required objectIDs parameter was not sent, click event can not be properly sent without");if(!e.positions)throw new Error("required positions parameter was not sent, click event can not be properly sent without");this.sendEvent("click",e)}.bind(this),this.clickedObjectIDs=function(e){if(!e)throw new Error("No params were sent to clickedObjectIDs function, please provide `objectIDs` to be reported");if(!e.objectIDs)throw new Error("required `objectIDs` parameter was not sent, click event can not be properly sent without");this.sendEvent("click",e)}.bind(this),this.clickedFilters=function(e){if(!e)throw new Error("No params were sent to clickedFilters function, please provide `filters` to be reported");if(!e.filters)throw new Error("required `filters` parameter was not sent, click event can not be properly sent without");this.sendEvent("click",e)}.bind(this),this.convertedObjectIDsAfterSearch=function(e){if(!e)throw new Error("No params were sent to convertedObjectIDsAfterSearch function, please provide `queryID` and `objectIDs` to be reported");if(!e.queryID)throw new Error("required queryID parameter was not sent, conversion event can not be properly sent without");if(!e.objectIDs)throw new Error("required objectIDs parameter was not sent, conversion event can not be properly sent without");this.sendEvent("conversion",e)}.bind(this),this.convertedObjectIDs=function(e){if(!e)throw new Error("No params were sent to convertedObjectIDs function, please provide `objectIDs` to be reported");if(!e.objectIDs)throw new Error("required objectIDs parameter was not sent, conversion event can not be properly sent without");this.sendEvent("conversion",e)}.bind(this),this.convertedFilters=function(e){if(!e)throw new Error("No params were sent to convertedFilters function, please provide `filters` to be reported");if(!e.filters)throw new Error("required filters parameter was not sent, conversion event can not be properly sent without");this.sendEvent("conversion",e)}.bind(this),this.viewedObjectIDs=function(e){if(!e)throw new Error("No params were sent to viewedObjectIDs function, please provide `objectIDs` to be reported");if(!e.objectIDs)throw new Error("required objectIDs parameter was not sent, view event can not be properly sent without");this.sendEvent("view",e)}.bind(this),this.viewedFilters=function(e){if(!e)throw new Error("No params were sent to viewedFilters function, please provide `filters` to be reported");if(!e.filters)throw new Error("required filters parameter was not sent, view event can not be properly sent without");this.sendEvent("view",e)}.bind(this),this.setUserToken(this.ANONYMOUS_USER_TOKEN),this.processQueue(window)}});