diff --git a/js/select2boxes.js b/js/select2boxes.js
index e141655..7ec4407 100644
--- a/js/select2boxes.js
+++ b/js/select2boxes.js
@@ -61,6 +61,16 @@
           width: 'style',
           tags: autocreate,
           tokenSeparators: [','],
+          tokenizer: function(input, selection, callback) {
+            if (input.indexOf(',') < 0 && input.indexOf(' ') < 0)
+              return;
+            var parts = input.split(/,| /);
+            for (var i = 0; i < parts.length; i++) {
+              var part = parts[i];
+              part = part.trim();
+              callback({id:part,text:part});
+            }
+          },
           containerCssClass: (drupalSettings.preloaded_entries && drupalSettings.preloaded_entries[field_name])
             ? 'preloaded'
             : '',
@@ -195,6 +205,16 @@
           multiple: multiple,
           tags: autocreate,
           tokenSeparators: [','],
+          tokenizer: function(input, selection, callback) {
+            if (input.indexOf(',') < 0 && input.indexOf(' ') < 0)
+              return;
+            var parts = input.split(/,| /);
+            for (var i = 0; i < parts.length; i++) {
+              var part = parts[i];
+              part = part.trim();
+              callback({id:part,text:part});
+            }
+          },
           templateResult: flagsIcons,
           templateSelection: flagsIcons
         });