diff --git a/web_m2x_options/readme/CONTRIBUTORS.rst b/web_m2x_options/readme/CONTRIBUTORS.rst
index 55e7725a3..1e4aebda1 100644
--- a/web_m2x_options/readme/CONTRIBUTORS.rst
+++ b/web_m2x_options/readme/CONTRIBUTORS.rst
@@ -4,8 +4,8 @@
 * Nicolas JEUDY <nicolas@sudokeys.com>
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
 * Zakaria Makrelouf <z.makrelouf@gmail.com>
-* Tecnativa <https://www.tecnativa.com>
-* Jairo Llopis <jairo.llopis@tecnativa.com>
-* David Vidal <david.vidal@tecnativa.com>
-* Ernesto Tejeda <ernesto.tejeda87@gmail.com>
-* Jeroen Evens <jeroen.evens@dynapps.be>
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Jairo Llopis <jairo.llopis@tecnativa.com>
+  * David Vidal <david.vidal@tecnativa.com>
+  * Ernesto Tejeda <ernesto.tejeda87@gmail.com>
diff --git a/web_m2x_options/static/src/js/form.js b/web_m2x_options/static/src/js/form.js
index 63a0603c4..51da55f39 100644
--- a/web_m2x_options/static/src/js/form.js
+++ b/web_m2x_options/static/src/js/form.js
@@ -119,12 +119,11 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
         },
 
         _search: function (search_val) {
-            var self = this;
-            var def = new Promise(function (resolve) {
+            var def = new Promise(resolve => {
                 // add options limit used to change number of selections record
                 // returned.
                 if (!_.isUndefined(self.ir_options['web_m2x_options.limit'])) {
-                    self.limit = parseInt(self.ir_options['web_m2x_options.limit'], 10);
+                    this.limit = parseInt(self.ir_options['web_m2x_options.limit'], 10);
                 }
 
                 if (typeof self.nodeOptions.limit === 'number') {
@@ -153,9 +152,9 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
                         limit: self.limit + 1,
                         context: context,
                     }
-                }).then(function (result) {
+                }).then(result => {
                     // possible selections for the m2o
-                    var values = _.map(result, function (x) {
+                    var values = _.map(result, x => {
                         x[1] = self._getDisplayName(x[1]);
                         return {
                             label: _.str.escapeHTML(x[1].trim()) || data.noDisplayContent,
@@ -176,7 +175,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
                             method: 'search_read',
                             fields: [self.field_color],
                             domain: [['id', 'in', value_ids]]
-                        }).then(function (objects) {
+                        }).then(objects => {
                             for (var index in objects) {
                                 for (var index_value in values) {
                                     if (values[index_value].id == objects[index].id) {