diff --git a/setup/web_search_with_and/odoo/addons/web_search_with_and b/setup/web_search_with_and/odoo/addons/web_search_with_and
new file mode 120000
index 000000000..d32981712
--- /dev/null
+++ b/setup/web_search_with_and/odoo/addons/web_search_with_and
@@ -0,0 +1 @@
+../../../../web_search_with_and
\ No newline at end of file
diff --git a/setup/web_search_with_and/setup.py b/setup/web_search_with_and/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/web_search_with_and/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/web_search_with_and/__manifest__.py b/web_search_with_and/__manifest__.py
index 50789ac78..e7166bdf5 100644
--- a/web_search_with_and/__manifest__.py
+++ b/web_search_with_and/__manifest__.py
@@ -1,17 +1,14 @@
 # Copyright 2015 Andrius Preimantas <andrius@versada.lt>
+# Copyright 2020 ACSONE SA/NV
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 {
-    'name': "Use AND conditions on omnibar search",
-    'version': '12.0.1.0.0',
-    'author': 'Versada UAB, Odoo Community Association (OCA)',
-    'license': 'AGPL-3',
-    'category': 'web',
-    'website': 'https://github.com/OCA/web',
-    'depends': [
-        'web',
-    ],
-    'data': [
-        'data/data.xml',
-    ],
+    "name": "Use AND conditions on omnibar search",
+    "version": "13.0.1.0.0",
+    "author": "Versada UAB, ACSONE SA/NV, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "category": "web",
+    "website": "https://github.com/OCA/web",
+    "depends": ["web"],
+    "data": ["data/data.xml"],
 }
diff --git a/web_search_with_and/data/data.xml b/web_search_with_and/data/data.xml
index 3d6a7956a..d64ec27f4 100644
--- a/web_search_with_and/data/data.xml
+++ b/web_search_with_and/data/data.xml
@@ -1,8 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <template id="assets_backend" name="web_view_editor assets" inherit_id="web.assets_backend">
+    <template
+        id="assets_backend"
+        name="web_view_editor assets"
+        inherit_id="web.assets_backend"
+    >
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/web_search_with_and/static/src/js/search.js"/>
+            <script
+                type="text/javascript"
+                src="/web_search_with_and/static/src/js/search.js"
+            />
         </xpath>
     </template>
 </odoo>
diff --git a/web_search_with_and/readme/CONTRIBUTORS.rst b/web_search_with_and/readme/CONTRIBUTORS.rst
index a2cfac0a0..de9ce208d 100644
--- a/web_search_with_and/readme/CONTRIBUTORS.rst
+++ b/web_search_with_and/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 * Adrien Didenot <adrien.didenot@horanet.com>
 * Francesco Apruzzese <f.apruzzese@apuliasoftware.it>
 * Numigi (tm) and all its contributors (https://bit.ly/numigiens)
+* Souheil Bejaoui <souheil.bejaoui@acsone.eu>
diff --git a/web_search_with_and/static/src/js/search.js b/web_search_with_and/static/src/js/search.js
index 74a55fa64..fc7380f7c 100644
--- a/web_search_with_and/static/src/js/search.js
+++ b/web_search_with_and/static/src/js/search.js
@@ -1,55 +1,39 @@
-odoo.define('web_search_with_and', function (require) {
+odoo.define("web_search_with_and", function(require) {
     "use strict";
 
-    var SearchView = require('web.SearchView');
-    var Backbone = window.Backbone;
+    var searchBarAutocompleteRegistry = require("web.search_bar_autocomplete_sources_registry");
+    var SearchBar = require("web.SearchBar");
 
-    SearchView.include({
-        // Override the base method to detect a 'shift' event
-        select_completion: function (e, ui) {
-            if (e.shiftKey
-                && ui.item.facet.values
-                && ui.item.facet.values.length
-                && String(ui.item.facet.values[0].value).trim() !== "") {
-                // In case of an 'AND' search a new facet is added regarding of the previous facets
+    SearchBar.include({
+        // Override the base method to detect a "shift" event
+        _onAutoCompleteSelected: function(e, ui) {
+            var values = ui.item.facet.values;
+            if (
+                e.shiftKey &&
+                values &&
+                values.length &&
+                String(values[0].value).trim() !== ""
+            ) {
+                // In case of an "AND" search a new facet is added regarding of
+                // the previous facets
                 e.preventDefault();
-
-                this.query.add(ui.item.facet, {shiftKey: true});
+                var filter = ui.item.facet.filter;
+                var field = this.fields[filter.attrs.name];
+                var Obj = searchBarAutocompleteRegistry.getAny([
+                    filter.attrs.widget,
+                    field.type,
+                ]);
+                var obj = new Obj(this, filter, field, this.actionContext);
+                var new_filter = Object.assign({}, ui.item.facet.filter, {
+                    domain: obj.getDomain(values),
+                    autoCompleteValues: values,
+                });
+                this.trigger_up("new_filters", {
+                    filters: [new_filter],
+                });
             } else {
-
                 return this._super.apply(this, arguments);
             }
-        }
+        },
     });
-
-    SearchView.SearchQuery.prototype = SearchView.SearchQuery.extend({
-        // Override the odoo method to (conditionally) add a search facet even if a existing
-        // facet for the same field/category already exists.
-        // The prototype is used to override the 'add' function in order to execute the
-        // following code before the Odoo native override (trick)
-        add: function (values, options) {
-            options = options || {};
-            if (options.shiftKey) {
-
-                if (!values) {
-                    values = [];
-                }
-                else if (!(values instanceof Array)) {
-                    values = [values];
-                }
-
-                delete options.shiftKey;
-                _(values).each(function (value) {
-                    var model = this._prepareModel(value, options);
-                    Backbone.Collection.prototype.add.call(this, model, options);
-                }, this);
-
-                return this;
-            }
-            else {
-                return this.constructor.__super__.add.call(this, values, options);
-            }
-        }
-    }).prototype;
-
 });