diff --git a/addons/website/static/src/js/website.theme.js b/addons/website/static/src/js/website.theme.js
index 0183311b0d9..6d498fc4133 100644
--- a/addons/website/static/src/js/website.theme.js
+++ b/addons/website/static/src/js/website.theme.js
@@ -94,13 +94,13 @@
                 });
         },
         get_inputs: function (string) {
-            return this.$inputs.filter('#'+string.split(",").join(", #"));
+            return this.$inputs.filter('#'+string.split(/\s*,\s*/).join(", #"));
         },
         get_xml_ids: function ($inputs) {
             var xml_ids = [];
             $inputs.each(function () {
                 if ($(this).data('xmlid') && $(this).data('xmlid').length) {
-                    xml_ids = xml_ids.concat($(this).data('xmlid').split(","));
+                    xml_ids = xml_ids.concat($(this).data('xmlid').split(/\s*,\s*/));
                 }
             });
             return xml_ids;