diff --git a/bower.json b/bower.json
index a6884b0..70b99f8 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-flexdatalist",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "main": ["jquery.flexdatalist.js"],
   "dependencies": {
     "jquery": ">=1.8"
diff --git a/jquery.flexdatalist.js b/jquery.flexdatalist.js
index 83850c2..4d1e795 100644
--- a/jquery.flexdatalist.js
+++ b/jquery.flexdatalist.js
@@ -64,6 +64,9 @@ jQuery.fn.flexdatalist = function (_option, _value) {
             target.fvalue.remove(_value);
         // Disabled/enabled
         } else if (_option === 'disabled') {
+            if (typeof _value === 'undefined') {
+                return target.fdisabled();
+            }
             target.fdisabled(_value);
         // Option(s)
         } else if (typeof _option === 'string') {
@@ -104,13 +107,14 @@ jQuery.fn.flexdatalist = function (_option, _value) {
         searchDelay: 300,
         normalizeString: null,
         multiple: null,
+        disabled: null,
         maxShownResults: 100,
         removeOnBackspace: true,
         noResultsText: 'No results found for "{keyword}"',
         toggleSelected: false,
         allowDuplicateValues: false,
         requestType: 'get',
-        requestContentType: 'default',
+        requestContentType: 'x-www-form-urlencoded',
         resultsProperty: 'results',
         keywordParamName: 'keyword',
         limitOfValues: 0,
@@ -133,7 +137,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
         this.init = function () {
             this.options.init();
             this.set.up();
-            this.fvalue.set($this.attr('value'), function () {
+            this.fvalue.set($this.attr('value')).on('after:flexdatalist.value', function () {
                 _this.fdisabled($this.is('[disabled]'));
             });
 
@@ -170,7 +174,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
 
             window.onresize = function (event) {
                 _this.position();
-            };            
+            };
         }
 
     /**
@@ -192,7 +196,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                         _this.fvalue.extract(val);
                         _this.results.remove();
                 }
-            },        
+            },
         /**
          * Check if keypress is valid.
          */
@@ -201,9 +205,9 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                     keyword = $alias.val(),
                     length = keyword.length,
                     options = _this.options.get();
-                
+
                 clearTimeout(_searchTimeout);
-                
+
                 // Ignore TAB and Shift
                 // Prevent closing results when navigating (in and out of focus) with tabs
                 if (options.minLength === 0 && length === 0 && (key === 9 || key === 16)) {
@@ -288,7 +292,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
         }
 
     /**
-     * Setup input.
+     * Setup flex.
      */
         this.set = {
         /**
@@ -353,35 +357,28 @@ jQuery.fn.flexdatalist = function (_option, _value) {
          */
             chained: function () {
                 var options = _this.options.get();
-                if (!options.relatives || !options.chainedRelatives) {
-                    return;
-                }
-                var toggle = function (init) {
-                    options.relatives.each(function () {
-                        var disabled = _this.isEmpty($(this).val()),
-                            empty = _this.isEmpty($this[0].value);
-
-                        // If disabling, clear all values
-                        if (!init && (disabled || !empty)) {
-                            _this.fvalue.clear();
-                        }
-                        if ($multiple) {
-                            disabled && $multiple ? $multiple.addClass('disabled') : $multiple.removeClass('disabled');
-                        } else {
-                            $alias.prop('disabled', disabled);
-                        }
+                if (options.relatives && options.chainedRelatives) {
+                    var toggle = function (init) {
+                        options.relatives.each(function () {
+                            var emptyRelative = _this.isEmpty($(this).val()),
+                                empty = _this.isEmpty($this[0].value);
+                            // If disabling, clear all values
+                            if (emptyRelative || !empty) {
+                                _this.fvalue.clear();
+                            }
+                            _this.fdisabled(emptyRelative);
+                        });
+                    };
+                    options.relatives.on('change', function () {
+                        toggle();
                     });
-                };
-
-                options.relatives.on('change', function () {
-                    toggle();
-                });
-                toggle(true);
+                    toggle(true);
+                }
             }
         }
 
     /**
-     * Manipulate input value(s) (where the magic happens).
+     * Process input value(s) (where the magic happens).
      */
         this.fvalue = {
         /**
@@ -404,9 +401,12 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                     this.clear(true);
                 }
                 if (!_this.fdisabled() && !_this.isEmpty(val)) {
-                    var _fvalue = this;
+                    var _fvalue = this,
+                        args = [val, null, _this.options.get()],
+                        event = append ? 'add' : 'value';
                     // Clear keyword
                     $alias[0].value = '';
+                    $this.trigger('before:flexdatalist.' + event, args);
                     this._process(val, function (values) {
                         if (!_this.isEmpty(values)) {
                             if ($.isArray(values)) {
@@ -416,15 +416,10 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                             } else {
                                 _fvalue.extract(values, true);
                             }
-                            $this.trigger('change:flexdatalist', [
-                                values,
-                                null,
-                                _this.options.get()
-                            ]).trigger('change');
-                            
-                            if (typeof append === 'function') {
-                                append();
-                            }
+                            $this
+                            .trigger('after:flexdatalist.' + event, args.splice(0, 1, values))
+                            .trigger('change:flexdatalist', args)
+                            .trigger('change');
                         }
                     });
                 }
@@ -435,7 +430,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
          */
             add: function (val) {
                 if (_this.options.get('multiple')) {
-                    return this.set(val, true);  
+                    return this.set(val, true);
                 }
             },
         /**
@@ -495,6 +490,9 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                     }
                 }
                 // For allowDuplicateValues
+                if (_this.isDup(val)) {
+                    return;
+                }
                 if (txt) {
                     _values.push(txt);
                 }
@@ -530,8 +528,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                 add: function (val, txt) {
                     var _multiple = this,
                         $li = this.li(val, txt),
-                        options = _this.options.get(),
-                        args = [val, txt, options];
+                        options = _this.options.get();
 
                     // Toggle
                     $li.click(function () {
@@ -541,11 +538,9 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                         _multiple.remove($(this).parent());
                     });
 
-                    $this.trigger('before:flexdatalist.add', args);
                     this.push(val);
                     $alias.val('', true);
                     this.checkLimit();
-                    $this.trigger('after:flexdatalist.add', args);
                 },
             /**
              * Push value to input.
@@ -571,7 +566,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                         action = $li.hasClass('disabled') ? 'enable' : 'disable',
                         current = _this.fvalue.get(),
                         args = [action, data.value, data.text, options];
-                        
+
                     $this.trigger('before:flexdatalist.toggle', [
                         action,
                         data.value,
@@ -608,7 +603,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                         args = [data.value, data.text, options];
 
                     $this.trigger('before:flexdatalist.remove', args);
-                    
+
                     var val = values.splice(index, 1);
                     values = _this.fvalue.toStr(values);
                     $this[0].value = values;
@@ -825,14 +820,14 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                     return (str.indexOf('{') === 0 || str.indexOf('[{') === 0);
                 }
                 var options = _this.options.get(),
-                    prop = options.valueProperty;                
+                    prop = options.valueProperty;
                 return (options.selectionRequired && (_this.isObject(prop) || prop === '*'));
             },
         /**
          * Is value expected to be JSON (either object or string).
          */
             isMixed: function () {
-                var options = _this.options.get();                
+                var options = _this.options.get();
                 return !options.selectionRequired && options.valueProperty === '*';
             },
         /**
@@ -863,6 +858,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                         // Datalist
                         __this.datalist(function (list) {
                             data = data.concat(list);
+
                             $this.trigger('after:flexdatalist.data', [data]);
                             callback(data);
                         });
@@ -955,7 +951,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                     callback(cache);
                     return;
                 }
-                
+
                 var data = $.extend(
                     relatives,
                     options.params,
@@ -993,16 +989,14 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                     return;
                 }
                 $this.addClass('flexdatalist-loading');
-                var contentType = 'application/x-www-form-urlencoded';
                 if (options.requestContentType === 'json') {
-                    contentType = 'application/json';
                     settings.data = JSON.stringify(data);
                 }
                 $.ajax($.extend(
                     {
                         type: options.requestType,
                         dataType: 'json',
-                        contentType: contentType + '; charset=UTF-8',
+                        contentType: 'application/' + options.requestContentType + '; charset=UTF-8',
                         complete: function () {
                             $this.removeClass('flexdatalist-loading');
                         }
@@ -1063,34 +1057,33 @@ jQuery.fn.flexdatalist = function (_option, _value) {
          */
             get: function (keywords, data, callback) {
                 var __this = this,
-                    options = _this.options.get(),
-                    matches = false;
+                    options = _this.options.get();
                 if (options.searchDisabled) {
                     _this.debug('Search is disabled!');
                     return;
                 }
-                $this.trigger('before:flexdatalist.search', [keywords, data]);
-                if (!_this.isEmpty(keywords)) {
-                    matches = [];
-                    var words = __this.split(keywords);
-                    for (var index = 0; index < data.length; index++) {
-                        var item = data[index];
-                        // Check for already set values
-                        if (!options.allowDuplicateValues) {
-                            var values = _values;
-                            if (values && values.indexOf(_this.fvalue.text(item)) > -1) {
+
+                var matches = _this.cache.read(keywords);
+                if (!matches) {
+                    $this.trigger('before:flexdatalist.search', [keywords, data]);
+                    if (!_this.isEmpty(keywords)) {
+                        matches = [];
+                        var words = __this.split(keywords);
+                        for (var index = 0; index < data.length; index++) {
+                            var item = data[index];
+                            if (_this.isDup(item)) {
                                 continue;
                             }
+                            item = __this.matches(item, words);
+                            if (item) {
+                                matches.push(item);
+                            }
                         }
-                        item = __this.matches(item, words);
-                        if (item) {
-                            matches.push(item);
-                        }
+                        _this.cache.write(keywords, matches, 10);
                     }
+                    $this.trigger('after:flexdatalist.search', [keywords, data, matches]);
                 }
-                $this.trigger('after:flexdatalist.search', [keywords, data, matches]);
                 callback(matches);
-                _this.cache.write(keywords, matches, 10);
             },
         /**
          * Match against searchable properties.
@@ -1504,6 +1497,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                     $this.data(),
                     {
                         multiple: (_options.multiple === null ? $this.is('[multiple]') : _options.multiple),
+                        disabled: (_options.disabled === null ? $this.is('[disabled]') : _options.disabled),
                         originalValue: $this[0].value
                     }
                 );
@@ -1537,7 +1531,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                 return options;
             }
         }
-    
+
     /**
      * Position results below parent element.
      */
@@ -1553,7 +1547,7 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                 'left': $target.offset().left + 'px'
             });
         }
-    
+
     /**
      * Handle disabled state.
      */
@@ -1563,14 +1557,33 @@ jQuery.fn.flexdatalist = function (_option, _value) {
                 $alias.prop('disabled', disabled);
                 if ($multiple) {
                     $multiple.css('background-color', $this.css('background-color'));
-                    var $btns = $multiple.find('li .fdl-remove');
-                    disabled ? $btns.hide() : $btns.show();
+                    var $btns = $multiple.find('li .fdl-remove'),
+                        $input = $multiple.find('li.input-container');
+                    if (disabled) {
+                        $multiple.addClass('disabled');
+                        $input.hide();
+                        $btns.hide();
+                    } else {
+                        $multiple.removeClass('disabled');
+                        $input.show();
+                        $btns.show();
+                    }
                 }
                 this.options.set('disabled', disabled);
             }
             return this.options.get('disabled');
         }
 
+    /**
+     * Check for dup values.
+     */
+        this.isDup = function (val) {
+            if (!this.options.get('allowDuplicateValues')) {
+                return _values.length > 0 && _values.indexOf(this.fvalue.text(val)) > -1;
+            }
+            return false;
+        }
+
     /**
      * Get key code from event.
      */
@@ -1693,11 +1706,11 @@ jQuery(function ($) {
                 index = $active.index(),
                 length = $li.length,
                 keynum = event.which || event.keyCode;
-            
+
             if (length === 0) {
                 return;
             }
-            
+
             // on escape key, remove results
             if (keynum === 27) {
                 $ul.remove();
diff --git a/jquery.flexdatalist.min.js b/jquery.flexdatalist.min.js
index e7953cf..342d423 100644
--- a/jquery.flexdatalist.min.js
+++ b/jquery.flexdatalist.min.js
@@ -1 +1 @@
-jQuery.fn.flexdatalist=function(e,t){"use strict";var i=function(e){e.each(function(){var e=$(this),t=e.data("flexdatalist");e.removeClass("flexdatalist-set").attr("type","text").val(t&&t.originalValue?t.originalValue:"").removeData("flexdatalist").next(".flexdatalist-alias, ul.flexdatalist-multiple").remove()})};if("string"==typeof e&&"reset"!==e){var a=this[0];if("destroy"===e)i($(this));else if("value"===e){if("undefined"==typeof t)return a.fvalue.get();a.fvalue.set(t)}else if("add"===e){if("undefined"==typeof t)return a.debug("Missing value to add!");a.fvalue.add(t)}else if("toggle"===e){if("undefined"==typeof t)return a.debug("Missing value to toggle!");a.fvalue.toggle(t)}else if("remove"===e){if("undefined"==typeof t)return a.debug("Missing value to remove!");a.fvalue.remove(t)}else if("disabled"===e)a.fdisabled(t);else if("string"==typeof e){if("undefined"==typeof t)return a.options.get(e);a.options.set(e,t)}return this}this&&"undefined"!=typeof this[0]&&"undefined"!=typeof this[0].fvalue&&i($(this));var r=$.extend({url:null,data:[],params:{},relatives:null,chainedRelatives:!1,cache:!0,cacheLifetime:60,minLength:2,groupBy:!1,selectionRequired:!1,focusFirstResult:!1,textProperty:null,valueProperty:null,visibleProperties:[],iconProperty:"thumb",searchIn:["label"],searchContain:!1,searchEqual:!1,searchByWord:!1,searchDisabled:!1,searchDelay:300,normalizeString:null,multiple:null,maxShownResults:100,removeOnBackspace:!0,noResultsText:'No results found for "{keyword}"',toggleSelected:!1,allowDuplicateValues:!1,requestType:"get",requestContentType:"default",resultsProperty:"results",keywordParamName:"keyword",limitOfValues:0,valuesSeparator:",",debug:!0},e);return this.each(function(e){var t=$(this),i=this,a=null,n=[],s="flex"+e,l=null,o=null;this.init=function(){this.options.init(),this.set.up(),this.fvalue.set(t.attr("value"),function(){i.fdisabled(t.is("[disabled]"))}),l.on("focusin",function(e){i.action.redoSearchFocus(e),i.action.showAllResults(e),o&&o.addClass("focus")}).on("input keydown",function(e){9===i.keyNum(e)&&i.results.remove(),i.action.keypressValue(e,188),i.action.backSpaceKeyRemove(e)}).on("input keyup",function(e){i.action.keypressValue(e,13),i.action.keypressSearch(e),i.action.copyValue(e),i.action.backSpaceKeyRemove(e)}).on("focusout",function(){o&&o.removeClass("focus")}),window.onresize=function(){i.position()}},this.action={keypressValue:function(e,t){var a=i.keyNum(e),r=l[0].value,n=i.options.get();if(r.length>0&&a===t&&!n.selectionRequired&&n.multiple){var r=l[0].value;e.preventDefault(),i.fvalue.extract(r),i.results.remove()}},keypressSearch:function(e){var t=i.keyNum(e),r=l.val(),n=r.length,s=i.options.get();clearTimeout(a),(0!==s.minLength||0!==n||9!==t&&16!==t)&&(0===n&&s.minLength>0||n<s.minLength?i.results.remove():(!t||13!==t&&(37>t||t>40))&&(i.results.remove(),a=setTimeout(function(){0===s.minLength&&n>0||s.minLength>0&&n>=s.minLength?i.data.load(function(e){i.search.get(r,e,function(e){i.results.show(e)})}):i.results.remove()},s.searchDelay)))},redoSearchFocus:function(e){var t=i.fvalue.get(),a=i.options.get(),r=l.val();(r.length>0&&a.multiple||r.length>0&&0===t.length)&&this.keypressSearch(e)},copyValue:function(e){if(13!==i.keyNum(e)){var t=l.val(),a=i.options.get();a.multiple||(a.selectionRequired?i.fvalue.clear():(i.fvalue.extract(t),0===t.length&&(n=[])))}},backSpaceKeyRemove:function(e){var t=i.options.get();if(t.removeOnBackspace){var a=l.val(),r=l.data("_remove");r?(r.find(".fdl-remove").click(),l.data("_remove",null)):0===a.length&&t.multiple&&8===i.keyNum(e)&&l.data("_remove",l.parents("li:eq(0)").prev())}},showAllResults:function(){var e=l.val();e=$.trim(e),""===e&&0===i.options.get("minLength")&&i.data.load(function(e){i.results.show(e)})}},this.set={up:function(){l=this.alias(),i.options.get("multiple")?o=this.multipleInput(l):l.insertAfter(t),l.attr("autofocus")&&l.focus(),this.chained()},alias:function(){var e=t.clone(!1).attr({list:null,name:t.attr("name")?"flexdatalist-"+t.attr("name"):null,id:t.attr("id")?t.attr("id")+"-flexdatalist":null,value:""}).addClass("flexdatalist-alias").removeClass("flexdatalist").attr("autocomplete","off");return t.addClass("flexdatalist flexdatalist-set").prop("type","hidden"),e},multipleInput:function(e){return o=$('<ul tabindex="1">').addClass("flexdatalist-multiple").css({"border-color":t.css("border-left-color"),"border-width":t.css("border-left-width"),"border-style":t.css("border-left-style"),"border-radius":t.css("border-top-left-radius"),"background-color":t.css("background-color")}).insertAfter(t).click(function(){$(this).find("input").focus()}),$('<li class="input-container">').addClass("flexdatalist-multiple-value").append(e).appendTo(o),o},chained:function(){var e=i.options.get();if(e.relatives&&e.chainedRelatives){var a=function(a){e.relatives.each(function(){var e=i.isEmpty($(this).val()),r=i.isEmpty(t[0].value);a||!e&&r||i.fvalue.clear(),o?e&&o?o.addClass("disabled"):o.removeClass("disabled"):l.prop("disabled",e)})};e.relatives.on("change",function(){a()}),a(!0)}}},this.fvalue={get:function(e){var t=i.value,a=i.options.get();return!a.multiple&&!this.isJSON()||e?this.toStr(t):this.toObj(t)},set:function(e,a){if(a||this.clear(!0),!i.fdisabled()&&!i.isEmpty(e)){var r=this;l[0].value="",this._process(e,function(e){i.isEmpty(e)||($.isArray(e)?$.each(e,function(e,t){r.extract(t,!0)}):r.extract(e,!0),t.trigger("change:flexdatalist",[e,null,i.options.get()]).trigger("change"),"function"==typeof a&&a())})}return t},add:function(e){return i.options.get("multiple")?this.set(e,!0):void 0},toggle:function(e){return i.fdisabled()||this.multiple.toggle(e),t},remove:function(e){return i.fdisabled()||this.multiple.remove(e),t},_process:function(e,t){var a=i.options.get();if(e=this.toObj(e),"string"==typeof a.valueProperty&&!this.isJSON(e)){var r=a.searchIn,n=a.searchEqual;return a.searchIn=a.valueProperty.split(","),a.searchEqual=!0,void i.data.load(function(s){i.search.get(e,s,function(e){t(e),a.searchIn=r,a.searchEqual=n})},e)}t(e)},extract:function(e,a){var r=this.text(e),s=this.value(e),l=(t[0].value,i.options.get());if(!i.isEmpty(e)){if(!s)return i.debug("No value found");if(!r)return i.debug("No text found")}r&&n.push(r),l.multiple?this.multiple.add(s,r):this.single(s,r),a||t.trigger("change:flexdatalist",[s,r,l]).trigger("change")},single:function(e,i){i&&i!==l.val()&&l.val(i,!0),t[0].value=e},multiple:{add:function(e,a){var r=this,n=this.li(e,a),s=i.options.get(),o=[e,a,s];n.click(function(){r.toggle($(this))}).find(".fdl-remove").click(function(){r.remove($(this).parent())}),t.trigger("before:flexdatalist.add",o),this.push(e),l.val("",!0),this.checkLimit(),t.trigger("after:flexdatalist.add",o)},push:function(e){var a=i.fvalue.get();e=i.fvalue.toObj(e),a.push(e),e=i.fvalue.toStr(a),t[0].value=e},toggle:function(e){var a=i.options.get();if(a.toggleSelected){e=this.findLi(e);var r=e.index(),n=e.data(),s=e.hasClass("disabled")?"enable":"disable",l=i.fvalue.get(),o=[s,n.value,n.text,a];if(t.trigger("before:flexdatalist.toggle",[s,n.value,n.text,a]),"enable"===s){var u=e.data("value");l.splice(r,0,u),e.removeClass("disabled")}else l.splice(r,1),e.addClass("disabled");l=i.fvalue.toStr(l),i.value=l,t.trigger("after:flexdatalist.toggle",o).trigger("change:flexdatalist",o).trigger("change")}},remove:function(e){e=this.findLi(e);var a=i.fvalue.get(),r=e.index(),s=e.data(),l=i.options.get(),o=[s.value,s.text,l];t.trigger("before:flexdatalist.remove",o);a.splice(r,1);a=i.fvalue.toStr(a),t[0].value=a,e.remove(),t.trigger("after:flexdatalist.remove",o).trigger("change:flexdatalist",o).trigger("change"),n.splice(r,1),i.fvalue.multiple.checkLimit()},removeAll:function(){var e=i.fvalue.get(),a=i.options.get();t.trigger("before:flexdatalist.remove.all",[e,a]),o.find("li:not(.input-container)").remove(),t[0].value="",n=[],t.trigger("after:flexdatalist.remove.all",[e,a])},li:function(e,t){var a=o.find("li.input-container");return $("<li>").addClass("value"+(i.options.get("toggleSelected")?" toggle":"")).append('<span class="text">'+t+"</span>").append('<span class="fdl-remove">&times;</span>').data({text:t,value:e}).insertBefore(a)},checkLimit:function(){var e=i.options.get("limitOfValues");if(e>0){var t=o.find("li.input-container"),a=n.length;e==a?t.hide():t.show()}},findLi:function(e){if("object"!=typeof e){var t=e;e=null,o.find("li:not(.input-container)").each(function(){var i=$(this);return i.data("value")===t?(e=i,!1):void 0})}return e},isEmpty:function(){return this.get().length>0}},value:function(e){var t=e,a=i.options.get();return i.isObject(e)&&(this.isJSON()||this.isMixed()?(delete e.name_highlight,t=this.toStr(e)):t=i.isDefined(e,a.valueProperty)?e[a.valueProperty]:i.isDefined(e,a.searchIn[0])?e[a.searchIn[0]]:null),t},text:function(e){var t=e,a=i.options.get();return i.isObject(e)&&(t=e[a.searchIn[0]],t=i.isDefined(e,a.textProperty)?e[a.textProperty]:this.placeholders.replace(e,a.textProperty,t)),$("<div>").html(t).text()},placeholders:{replace:function(e,t,a){if(i.isObject(e)&&"string"==typeof t){var r=this.parse(t);if(!i.isEmpty(e)&&r)return $.each(r,function(a,r){i.isDefined(e,r)&&(t=t.replace(a,e[r]))}),t}return a},parse:function(e){var t=e.match(/\{.+?\}/g);if(t){var i={};return t.map(function(e){i[e]=e.slice(1,-1)}),i}return!1}},clear:function(e){var a=t[0].value,r=i.options.get();return r.multiple&&this.multiple.removeAll(),t[0].value="",""!==a&&t.trigger("change:flexdatalist",[null,null,r]).trigger("change"),e&&l.val("",!0),n=[],t},toObj:function(e){if("object"!=typeof e){var t=i.options.get();i.isEmpty(e)||!i.isDefined(e)?e=t.multiple?[]:this.isJSON()?{}:"":this.isCSV()?(e=e.toString().split(t.valuesSeparator),e=$.map(e,function(e){return $.trim(e)})):(this.isJSON()||this.isMixed()&&this.isJSON(e))&&(e=JSON.parse(e))}return e},toStr:function(e){return"string"!=typeof e&&(i.isEmpty(e)||!i.isDefined(e)?e="":"number"==typeof e?e=e.toString():this.isCSV()?e=e.join(i.options.get("valuesSeparator")):(this.isJSON()||this.isMixed())&&(e=JSON.stringify(e))),$.trim(e)},isJSON:function(e){if("undefined"!=typeof e){if(i.isObject(e))e=JSON.stringify(e);else if("string"!=typeof e)return!1;return 0===e.indexOf("{")||0===e.indexOf("[{")}var t=i.options.get(),a=t.valueProperty;return t.selectionRequired&&(i.isObject(a)||"*"===a)},isMixed:function(){var e=i.options.get();return!e.selectionRequired&&"*"===e.valueProperty},isCSV:function(){return!this.isJSON()&&i.options.get("multiple")}},this.data={load:function(e,i){var a=this,r=[];t.trigger("before:flexdatalist.data"),this.url(function(i){r=r.concat(i),a["static"](function(i){r=r.concat(i),a.datalist(function(i){r=r.concat(i),t.trigger("after:flexdatalist.data",[r]),e(r)})})},i)},"static":function(e){var t=i.options.get();if("string"==typeof t.data){var a=t.data,r=i.cache.read(a,!0);if(r)return void e(r);this.remote({url:a,success:function(r){t.data=r,e(r),i.cache.write(a,r,t.cacheLifetime,!0)}})}else"object"!=typeof t.data&&(t.data=[]),e(t.data)},datalist:function(e){var a=t.attr("list"),r=[];i.isEmpty(a)||$("#"+a).find("option").each(function(){var e=$(this),t=e.val(),i=e.text();r.push({label:i.length>0?i:t,value:t})}),e(r)},url:function(e,t){var a=l.val(),r=i.options.get(),n=r.keywordParamName,s=i.fvalue.get(),o=this.relativesData();if(i.isEmpty(r.url))return e([]);var u={};"post"===r.requestType&&($.each(r,function(e,t){0!=e.indexOf("_")&&"data"!=e&&(u[e]=t)}),delete u.relatives);var f=i.cache.keyGen({relative:o,load:t,keyword:a,contain:r.searchContain},r.url),c=i.cache.read(f);if(c)return void e(c);var d=$.extend(o,r.params,{load:t,contain:r.searchContain,selected:s,original:r.originalValue,options:u});d[n]=a,this.remote({url:r.url,data:d,success:function(t){var n=l.val();n.length>=a.length&&e(t),i.cache.write(f,t,r.cacheLifetime)}})},remote:function(e){var a=this,r=i.options.get();if(!t.hasClass("flexdatalist-loading")){t.addClass("flexdatalist-loading");var n="application/x-www-form-urlencoded";"json"===r.requestContentType&&(n="application/json",e.data=JSON.stringify(data)),$.ajax($.extend({type:r.requestType,dataType:"json",contentType:n+"; charset=UTF-8",complete:function(){t.removeClass("flexdatalist-loading")}},e,{success:function(t){t=a.extractRemoteData(t),e.success(t)}}))}},extractRemoteData:function(e){var t=i.options.get(),a=i.isDefined(e,t.resultsProperty)?e[t.resultsProperty]:e;return"string"==typeof a&&0===a.indexOf("[{")&&(a=JSON.parse(a)),a&&a.options&&i.options.set($.extend({},t,a.options)),i.isObject(a)?a:[]},relativesData:function(){var e=i.options.get("relatives"),t={};return e&&(t.relatives={},e.each(function(){var e=$(this),i=e.attr("name").split("][").join("-").split("]").join("-").split("[").join("-").replace(/^\|+|\-+$/g,"");t.relatives[i]=e.val()})),t}},this.search={get:function(e,a,r){var s=this,l=i.options.get(),o=!1;if(l.searchDisabled)return void i.debug("Search is disabled!");if(t.trigger("before:flexdatalist.search",[e,a]),!i.isEmpty(e)){o=[];for(var u=s.split(e),f=0;f<a.length;f++){var c=a[f];if(!l.allowDuplicateValues){var d=n;if(d&&d.indexOf(i.fvalue.text(c))>-1)continue}c=s.matches(c,u),c&&o.push(c)}}t.trigger("after:flexdatalist.search",[e,a,o]),r(o),i.cache.write(e,o,10)},matches:function(e,t){var a=$.extend({},e),r=[],n=i.options.get(),s=n.searchIn;if(t.length>0)for(var l=0;l<s.length;l++){var o=s[l];if(i.isDefined(e,o)&&e[o]){for(var u=e[o].toString(),f=u,c=this.split(u),d=0;d<t.length;d++){var p=t[d];this.find(p,c)&&(r.push(p),f=this.highlight(p,f))}f!==u&&(a[o+"_highlight"]=this.highlight(f))}}return 0===r.length||n.searchByWord&&r.length<t.length-1?!1:a},highlight:function(e,t){return t?t.replace(new RegExp(e,i.options.get("searchContain")?"ig":"i"),"|:|$&|::|"):(e=e.split("|:|").join('<span class="highlight">'),e.split("|::|").join("</span>"))},find:function(e,t){for(var a=i.options.get(),r=0;r<t.length;r++){var n=t[r];if(n=this.normalizeString(n),e=this.normalizeString(e),a.searchEqual)return n==e;if(a.searchContain?n.indexOf(e)>=0:0===n.indexOf(e))return!0}return!1},split:function(e){if("string"==typeof e&&(e=[$.trim(e)]),i.options.get("searchByWord"))for(var t=0;t<e.length;t++){var a=$.trim(e[t]);if(a.indexOf(" ")>0){var r=a.split(" ");$.merge(e,r)}}return e},normalizeString:function(e){if("string"==typeof e){var t=i.options.get("normalizeString");return"function"==typeof t&&(e=t(e)),e.toUpperCase()}return e}},this.results={show:function(e){var a=this,r=i.options.get();if(this.remove(!0),e){if(0===e.length)return void this.empty(r.noResultsText);var n=this.container();r.groupBy?(e=this.group(e),Object.keys(e).forEach(function(t){var s=e[t],l=r.groupBy,o=i.results.highlight(s[0],l,t);$("<li>").addClass("group").append($("<span>").addClass("group-name").html(o)).append($("<span>").addClass("group-item-count").text(" "+s.length)).appendTo(n);a.items(s,n)})):this.items(e,n);var s=n.find("li:not(.group)");s.on("click",function(){var e=$(this).data("item");e&&(i.fvalue.extract(e),a.remove(),t.trigger("select:flexdatalist",[e,r]))}).hover(function(){s.removeClass("active"),$(this).addClass("active")},function(){$(this).removeClass("active")}),r.focusFirstResult&&s.filter(":first").addClass("active")}},empty:function(e){if(!i.isEmpty(e)){var t=this.container(),a=l.val();e=e.split("{keyword}").join(a),$("<li>").addClass("item no-results").append(e).appendTo(t)}},items:function(e,a){var r=i.options.get("maxShownResults");t.trigger("show:flexdatalist.results",[e]);for(var n=0;n<e.length&&!(r>0&&r===n);n++)this.item(e[n]).appendTo(a);t.trigger("shown:flexdatalist.results",[e])},item:function(e){for(var t=$("<li>").data("item",e).addClass("item"),a=i.options.get(),r=a.visibleProperties,n=0;n<r.length;n++){var s=r[n];if((!a.groupBy||a.groupBy!==s)&&i.isDefined(e,s)){var l={};if(s===a.iconProperty)l=$("<img>").addClass("item item-"+s).attr("src",e[s]);else{var o=i.results.highlight(e,s);l=$("<span>").addClass("item item-"+s).html(o+" ")}l.appendTo(t)}}return t},container:function(){var e=t;o&&(e=o);var a=$("ul.flexdatalist-results");return 0===a.length&&(a=$("<ul>").addClass("flexdatalist-results").appendTo("body").css({"border-color":e.css("border-left-color"),"border-width":"1px","border-bottom-left-radius":e.css("border-bottom-left-radius"),"border-bottom-right-radius":e.css("border-bottom-right-radius")}).data({target:l,input:t}),i.position(l)),a},group:function(e){for(var t=[],a=i.options.get("groupBy"),r=0;r<e.length;r++){var n=e[r];if(i.isDefined(n,a)){var s=n[a];i.isDefined(t,s)||(t[s]=[]),t[s].push(n)}}return t},highlight:function(e,t,a){return i.isDefined(e,t+"_highlight")?e[t+"_highlight"]:i.isDefined(e,t)?e[t]:a},remove:function(e){var i="ul.flexdatalist-results";e&&(i="ul.flexdatalist-results li"),$(i).remove(),t.trigger("removed:flexdatalist.results")}},this.cache={write:function(e,t,a,r){if(i.cache.isSupported()){e=this.keyGen(e,void 0,r);var n={value:t,timestamp:i.unixtime(),lifetime:a?a:!1};localStorage.setItem(e,JSON.stringify(n))}},read:function(e,t){if(i.cache.isSupported()){e=this.keyGen(e,void 0,t);var a=localStorage.getItem(e);if(a){var r=JSON.parse(a);if(r.lifetime){var n=i.unixtime()-r.timestamp;return r.lifetime>n?r.value:(i.cache["delete"](e),null)}return r.value}}return null},"delete":function(e,t){i.cache.isSupported()&&(e=this.keyGen(e,void 0,t),localStorage.removeItem(e))},clear:function(){if(i.cache.isSupported()){for(var e in localStorage)(e.indexOf(s)>-1||e.indexOf("global")>-1)&&i.cache["delete"](e);localStorage.clear()}},isSupported:function(){if(i.options.get("cache"))try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}return!1},keyGen:function(e,t,i){"object"==typeof e&&(e=JSON.stringify(e));var a,r,n=void 0===t?2166136261:t;for(a=0,r=e.length;r>a;a++)n^=e.charCodeAt(a),n+=(n<<1)+(n<<4)+(n<<7)+(n<<8)+(n<<24);return(i?"global":s)+("0000000"+(n>>>0).toString(16)).substr(-8)}},this.options={init:function(){var e=$.extend({},r,t.data(),{multiple:null===r.multiple?t.is("[multiple]"):r.multiple,originalValue:t[0].value});this.set(e)},get:function(e){var a=t.data("flexdatalist");return e?i.isDefined(a,e)?a[e]:null:a},set:function(e,a){var r=this.get();return i.isDefined(r,e)&&i.isDefined(a)?r[e]=a:i.isObject(e)&&(r=this._normalize(e)),t.data("flexdatalist",r),t},_normalize:function(e){if(e.searchIn=i.csvToArray(e.searchIn),e.relatives=e.relatives&&$(e.relatives).length>0?$(e.relatives):null,e.textProperty=null===e.textProperty?e.searchIn[0]:e.textProperty,e.visibleProperties=i.csvToArray(e.visibleProperties,e.searchIn),"*"===e.valueProperty&&e.multiple&&!e.selectionRequired)throw new Error("Selection must be required for multiple, JSON fields!");return e}},this.position=function(){var e=l;o&&(e=o),$("ul.flexdatalist-results").css({width:e.outerWidth()+"px",top:e.offset().top+e.outerHeight()+"px",left:e.offset().left+"px"})},this.fdisabled=function(e){if(this.isDefined(e)){if(t.prop("disabled",e),l.prop("disabled",e),o){o.css("background-color",t.css("background-color"));var i=o.find("li .fdl-remove");e?i.hide():i.show()}this.options.set("disabled",e)}return this.options.get("disabled")},this.keyNum=function(e){return e.which||e.keyCode},this.isEmpty=function(e){return i.isDefined(e)?null===e?!0:e===!0?!1:0===this.length(e)?!0:""===$.trim(e):!0},this.isObject=function(e){return e&&"object"==typeof e},this.length=function(e){return this.isObject(e)?Object.keys(e).length:"number"==typeof e||"number"==typeof e.length?e.toString().length:0},this.isDefined=function(e,t){var i="undefined"!=typeof e;return i&&"undefined"!=typeof t?"undefined"!=typeof e[t]:i},this.unixtime=function(e){var t=new Date;return e&&(t=new Date(e)),Math.round(t.getTime()/1e3)},this.csvToArray=function(e,t){return 0===e.length?t:"string"==typeof e?e.split(i.options.get("valuesSeparator")):e},this.debug=function(e,a){var r=i.options.get();r.debug&&(a||(a={}),e="Flexdatalist: "+e,console.warn(e),console.log($.extend({inputName:t.attr("name"),options:r},a)),console.log("--- /flexdatalist ---"))},this.init()})},jQuery(function(e){var t=e(document);t.data("flexdatalist")||e(document).mouseup(function(t){var i=e(".flexdatalist-results"),a=i.data("target");a&&a.is(":focus")||i.is(t.target)||0!==i.has(t.target).length||i.remove()}).keydown(function(t){var i=e(".flexdatalist-results"),a=i.find("li"),r=a.filter(".active"),n=r.index(),s=a.length,l=t.which||t.keyCode;if(0!==s){if(27===l)return void i.remove();if(13===l)t.preventDefault(),r.click();else if(40===l||38===l){t.preventDefault(),40===l?r=s>n&&r.nextAll(".item").first().length>0?r.removeClass("active").nextAll(".item").first().addClass("active"):a.removeClass("active").filter(".item:first").addClass("active"):38===l&&(r=n>0&&r.prevAll(".item").first().length>0?r.removeClass("active").prevAll(".item").first().addClass("active"):a.removeClass("active").filter(".item:last").addClass("active"));var o=(0===r.prev().length?r:r.prev()).position().top;i.animate({scrollTop:o+i.scrollTop()},100)}}}).data("flexdatalist",!0),jQuery("input.flexdatalist:not(.flexdatalist-set)").flexdatalist()}),function(e){var t=e.fn.val;e.fn.val=function(i){var a=e(this).hasClass("flexdatalist");return"undefined"==typeof i?a?this[0].fvalue.get(!0):t.call(this):a?this[0].fvalue.set(i):t.call(this,i)}}(jQuery);
\ No newline at end of file
+jQuery.fn.flexdatalist=function(e,t){"use strict";var i=function(e){e.each(function(){var e=$(this),t=e.data("flexdatalist");e.removeClass("flexdatalist-set").attr("type","text").val(t&&t.originalValue?t.originalValue:"").removeData("flexdatalist").next(".flexdatalist-alias, ul.flexdatalist-multiple").remove()})};if("string"==typeof e&&"reset"!==e){var a=this[0];if("destroy"===e)i($(this));else if("value"===e){if("undefined"==typeof t)return a.fvalue.get();a.fvalue.set(t)}else if("add"===e){if("undefined"==typeof t)return a.debug("Missing value to add!");a.fvalue.add(t)}else if("toggle"===e){if("undefined"==typeof t)return a.debug("Missing value to toggle!");a.fvalue.toggle(t)}else if("remove"===e){if("undefined"==typeof t)return a.debug("Missing value to remove!");a.fvalue.remove(t)}else if("disabled"===e){if("undefined"==typeof t)return a.fdisabled();a.fdisabled(t)}else if("string"==typeof e){if("undefined"==typeof t)return a.options.get(e);a.options.set(e,t)}return this}this&&"undefined"!=typeof this[0]&&"undefined"!=typeof this[0].fvalue&&i($(this));var r=$.extend({url:null,data:[],params:{},relatives:null,chainedRelatives:!1,cache:!0,cacheLifetime:60,minLength:2,groupBy:!1,selectionRequired:!1,focusFirstResult:!1,textProperty:null,valueProperty:null,visibleProperties:[],iconProperty:"thumb",searchIn:["label"],searchContain:!1,searchEqual:!1,searchByWord:!1,searchDisabled:!1,searchDelay:300,normalizeString:null,multiple:null,disabled:null,maxShownResults:100,removeOnBackspace:!0,noResultsText:'No results found for "{keyword}"',toggleSelected:!1,allowDuplicateValues:!1,requestType:"get",requestContentType:"x-www-form-urlencoded",resultsProperty:"results",keywordParamName:"keyword",limitOfValues:0,valuesSeparator:",",debug:!0},e);return this.each(function(e){var t=$(this),i=this,a=null,n=[],s="flex"+e,l=null,o=null;this.init=function(){this.options.init(),this.set.up(),this.fvalue.set(t.attr("value")).on("after:flexdatalist.value",function(){i.fdisabled(t.is("[disabled]"))}),l.on("focusin",function(e){i.action.redoSearchFocus(e),i.action.showAllResults(e),o&&o.addClass("focus")}).on("input keydown",function(e){9===i.keyNum(e)&&i.results.remove(),i.action.keypressValue(e,188),i.action.backSpaceKeyRemove(e)}).on("input keyup",function(e){i.action.keypressValue(e,13),i.action.keypressSearch(e),i.action.copyValue(e),i.action.backSpaceKeyRemove(e)}).on("focusout",function(){o&&o.removeClass("focus")}),window.onresize=function(){i.position()}},this.action={keypressValue:function(e,t){var a=i.keyNum(e),r=l[0].value,n=i.options.get();if(r.length>0&&a===t&&!n.selectionRequired&&n.multiple){var r=l[0].value;e.preventDefault(),i.fvalue.extract(r),i.results.remove()}},keypressSearch:function(e){var t=i.keyNum(e),r=l.val(),n=r.length,s=i.options.get();clearTimeout(a),(0!==s.minLength||0!==n||9!==t&&16!==t)&&(0===n&&s.minLength>0||n<s.minLength?i.results.remove():(!t||13!==t&&(37>t||t>40))&&(i.results.remove(),a=setTimeout(function(){0===s.minLength&&n>0||s.minLength>0&&n>=s.minLength?i.data.load(function(e){i.search.get(r,e,function(e){i.results.show(e)})}):i.results.remove()},s.searchDelay)))},redoSearchFocus:function(e){var t=i.fvalue.get(),a=i.options.get(),r=l.val();(r.length>0&&a.multiple||r.length>0&&0===t.length)&&this.keypressSearch(e)},copyValue:function(e){if(13!==i.keyNum(e)){var t=l.val(),a=i.options.get();a.multiple||(a.selectionRequired?i.fvalue.clear():(i.fvalue.extract(t),0===t.length&&(n=[])))}},backSpaceKeyRemove:function(e){var t=i.options.get();if(t.removeOnBackspace){var a=l.val(),r=l.data("_remove");r?(r.find(".fdl-remove").click(),l.data("_remove",null)):0===a.length&&t.multiple&&8===i.keyNum(e)&&l.data("_remove",l.parents("li:eq(0)").prev())}},showAllResults:function(){var e=l.val();e=$.trim(e),""===e&&0===i.options.get("minLength")&&i.data.load(function(e){i.results.show(e)})}},this.set={up:function(){l=this.alias(),i.options.get("multiple")?o=this.multipleInput(l):l.insertAfter(t),l.attr("autofocus")&&l.focus(),this.chained()},alias:function(){var e=t.clone(!1).attr({list:null,name:t.attr("name")?"flexdatalist-"+t.attr("name"):null,id:t.attr("id")?t.attr("id")+"-flexdatalist":null,value:""}).addClass("flexdatalist-alias").removeClass("flexdatalist").attr("autocomplete","off");return t.addClass("flexdatalist flexdatalist-set").prop("type","hidden"),e},multipleInput:function(e){return o=$('<ul tabindex="1">').addClass("flexdatalist-multiple").css({"border-color":t.css("border-left-color"),"border-width":t.css("border-left-width"),"border-style":t.css("border-left-style"),"border-radius":t.css("border-top-left-radius"),"background-color":t.css("background-color")}).insertAfter(t).click(function(){$(this).find("input").focus()}),$('<li class="input-container">').addClass("flexdatalist-multiple-value").append(e).appendTo(o),o},chained:function(){var e=i.options.get();if(e.relatives&&e.chainedRelatives){var a=function(){e.relatives.each(function(){var e=i.isEmpty($(this).val()),a=i.isEmpty(t[0].value);!e&&a||i.fvalue.clear(),i.fdisabled(e)})};e.relatives.on("change",function(){a()}),a(!0)}}},this.fvalue={get:function(e){var t=i.value,a=i.options.get();return!a.multiple&&!this.isJSON()||e?this.toStr(t):this.toObj(t)},set:function(e,a){if(a||this.clear(!0),!i.fdisabled()&&!i.isEmpty(e)){var r=this,n=[e,null,i.options.get()],s=a?"add":"value";l[0].value="",t.trigger("before:flexdatalist."+s,n),this._process(e,function(e){i.isEmpty(e)||($.isArray(e)?$.each(e,function(e,t){r.extract(t,!0)}):r.extract(e,!0),t.trigger("after:flexdatalist."+s,n.splice(0,1,e)).trigger("change:flexdatalist",n).trigger("change"))})}return t},add:function(e){return i.options.get("multiple")?this.set(e,!0):void 0},toggle:function(e){return i.fdisabled()||this.multiple.toggle(e),t},remove:function(e){return i.fdisabled()||this.multiple.remove(e),t},_process:function(e,t){var a=i.options.get();if(e=this.toObj(e),"string"==typeof a.valueProperty&&!this.isJSON(e)){var r=a.searchIn,n=a.searchEqual;return a.searchIn=a.valueProperty.split(","),a.searchEqual=!0,void i.data.load(function(s){i.search.get(e,s,function(e){t(e),a.searchIn=r,a.searchEqual=n})},e)}t(e)},extract:function(e,a){var r=this.text(e),s=this.value(e),l=(t[0].value,i.options.get());if(!i.isEmpty(e)){if(!s)return i.debug("No value found");if(!r)return i.debug("No text found")}i.isDup(e)||(r&&n.push(r),l.multiple?this.multiple.add(s,r):this.single(s,r),a||t.trigger("change:flexdatalist",[s,r,l]).trigger("change"))},single:function(e,i){i&&i!==l.val()&&l.val(i,!0),t[0].value=e},multiple:{add:function(e,t){var a=this,r=this.li(e,t);i.options.get();r.click(function(){a.toggle($(this))}).find(".fdl-remove").click(function(){a.remove($(this).parent())}),this.push(e),l.val("",!0),this.checkLimit()},push:function(e){var a=i.fvalue.get();e=i.fvalue.toObj(e),a.push(e),e=i.fvalue.toStr(a),t[0].value=e},toggle:function(e){var a=i.options.get();if(a.toggleSelected){e=this.findLi(e);var r=e.index(),n=e.data(),s=e.hasClass("disabled")?"enable":"disable",l=i.fvalue.get(),o=[s,n.value,n.text,a];if(t.trigger("before:flexdatalist.toggle",[s,n.value,n.text,a]),"enable"===s){var u=e.data("value");l.splice(r,0,u),e.removeClass("disabled")}else l.splice(r,1),e.addClass("disabled");l=i.fvalue.toStr(l),i.value=l,t.trigger("after:flexdatalist.toggle",o).trigger("change:flexdatalist",o).trigger("change")}},remove:function(e){e=this.findLi(e);var a=i.fvalue.get(),r=e.index(),s=e.data(),l=i.options.get(),o=[s.value,s.text,l];t.trigger("before:flexdatalist.remove",o);a.splice(r,1);a=i.fvalue.toStr(a),t[0].value=a,e.remove(),t.trigger("after:flexdatalist.remove",o).trigger("change:flexdatalist",o).trigger("change"),n.splice(r,1),i.fvalue.multiple.checkLimit()},removeAll:function(){var e=i.fvalue.get(),a=i.options.get();t.trigger("before:flexdatalist.remove.all",[e,a]),o.find("li:not(.input-container)").remove(),t[0].value="",n=[],t.trigger("after:flexdatalist.remove.all",[e,a])},li:function(e,t){var a=o.find("li.input-container");return $("<li>").addClass("value"+(i.options.get("toggleSelected")?" toggle":"")).append('<span class="text">'+t+"</span>").append('<span class="fdl-remove">&times;</span>').data({text:t,value:e}).insertBefore(a)},checkLimit:function(){var e=i.options.get("limitOfValues");if(e>0){var t=o.find("li.input-container"),a=n.length;e==a?t.hide():t.show()}},findLi:function(e){if("object"!=typeof e){var t=e;e=null,o.find("li:not(.input-container)").each(function(){var i=$(this);return i.data("value")===t?(e=i,!1):void 0})}return e},isEmpty:function(){return this.get().length>0}},value:function(e){var t=e,a=i.options.get();return i.isObject(e)&&(this.isJSON()||this.isMixed()?(delete e.name_highlight,t=this.toStr(e)):t=i.isDefined(e,a.valueProperty)?e[a.valueProperty]:i.isDefined(e,a.searchIn[0])?e[a.searchIn[0]]:null),t},text:function(e){var t=e,a=i.options.get();return i.isObject(e)&&(t=e[a.searchIn[0]],t=i.isDefined(e,a.textProperty)?e[a.textProperty]:this.placeholders.replace(e,a.textProperty,t)),$("<div>").html(t).text()},placeholders:{replace:function(e,t,a){if(i.isObject(e)&&"string"==typeof t){var r=this.parse(t);if(!i.isEmpty(e)&&r)return $.each(r,function(a,r){i.isDefined(e,r)&&(t=t.replace(a,e[r]))}),t}return a},parse:function(e){var t=e.match(/\{.+?\}/g);if(t){var i={};return t.map(function(e){i[e]=e.slice(1,-1)}),i}return!1}},clear:function(e){var a=t[0].value,r=i.options.get();return r.multiple&&this.multiple.removeAll(),t[0].value="",""!==a&&t.trigger("change:flexdatalist",[null,null,r]).trigger("change"),e&&l.val("",!0),n=[],t},toObj:function(e){if("object"!=typeof e){var t=i.options.get();i.isEmpty(e)||!i.isDefined(e)?e=t.multiple?[]:this.isJSON()?{}:"":this.isCSV()?(e=e.toString().split(t.valuesSeparator),e=$.map(e,function(e){return $.trim(e)})):(this.isJSON()||this.isMixed()&&this.isJSON(e))&&(e=JSON.parse(e))}return e},toStr:function(e){return"string"!=typeof e&&(i.isEmpty(e)||!i.isDefined(e)?e="":"number"==typeof e?e=e.toString():this.isCSV()?e=e.join(i.options.get("valuesSeparator")):(this.isJSON()||this.isMixed())&&(e=JSON.stringify(e))),$.trim(e)},isJSON:function(e){if("undefined"!=typeof e){if(i.isObject(e))e=JSON.stringify(e);else if("string"!=typeof e)return!1;return 0===e.indexOf("{")||0===e.indexOf("[{")}var t=i.options.get(),a=t.valueProperty;return t.selectionRequired&&(i.isObject(a)||"*"===a)},isMixed:function(){var e=i.options.get();return!e.selectionRequired&&"*"===e.valueProperty},isCSV:function(){return!this.isJSON()&&i.options.get("multiple")}},this.data={load:function(e,i){var a=this,r=[];t.trigger("before:flexdatalist.data"),this.url(function(i){r=r.concat(i),a["static"](function(i){r=r.concat(i),a.datalist(function(i){r=r.concat(i),t.trigger("after:flexdatalist.data",[r]),e(r)})})},i)},"static":function(e){var t=i.options.get();if("string"==typeof t.data){var a=t.data,r=i.cache.read(a,!0);if(r)return void e(r);this.remote({url:a,success:function(r){t.data=r,e(r),i.cache.write(a,r,t.cacheLifetime,!0)}})}else"object"!=typeof t.data&&(t.data=[]),e(t.data)},datalist:function(e){var a=t.attr("list"),r=[];i.isEmpty(a)||$("#"+a).find("option").each(function(){var e=$(this),t=e.val(),i=e.text();r.push({label:i.length>0?i:t,value:t})}),e(r)},url:function(e,t){var a=l.val(),r=i.options.get(),n=r.keywordParamName,s=i.fvalue.get(),o=this.relativesData();if(i.isEmpty(r.url))return e([]);var u={};"post"===r.requestType&&($.each(r,function(e,t){0!=e.indexOf("_")&&"data"!=e&&(u[e]=t)}),delete u.relatives);var f=i.cache.keyGen({relative:o,load:t,keyword:a,contain:r.searchContain},r.url),c=i.cache.read(f);if(c)return void e(c);var d=$.extend(o,r.params,{load:t,contain:r.searchContain,selected:s,original:r.originalValue,options:u});d[n]=a,this.remote({url:r.url,data:d,success:function(t){var n=l.val();n.length>=a.length&&e(t),i.cache.write(f,t,r.cacheLifetime)}})},remote:function(e){var a=this,r=i.options.get();t.hasClass("flexdatalist-loading")||(t.addClass("flexdatalist-loading"),"json"===r.requestContentType&&(e.data=JSON.stringify(data)),$.ajax($.extend({type:r.requestType,dataType:"json",contentType:"application/"+r.requestContentType+"; charset=UTF-8",complete:function(){t.removeClass("flexdatalist-loading")}},e,{success:function(t){t=a.extractRemoteData(t),e.success(t)}})))},extractRemoteData:function(e){var t=i.options.get(),a=i.isDefined(e,t.resultsProperty)?e[t.resultsProperty]:e;return"string"==typeof a&&0===a.indexOf("[{")&&(a=JSON.parse(a)),a&&a.options&&i.options.set($.extend({},t,a.options)),i.isObject(a)?a:[]},relativesData:function(){var e=i.options.get("relatives"),t={};return e&&(t.relatives={},e.each(function(){var e=$(this),i=e.attr("name").split("][").join("-").split("]").join("-").split("[").join("-").replace(/^\|+|\-+$/g,"");t.relatives[i]=e.val()})),t}},this.search={get:function(e,a,r){var n=this,s=i.options.get();if(s.searchDisabled)return void i.debug("Search is disabled!");var l=i.cache.read(e);if(!l){if(t.trigger("before:flexdatalist.search",[e,a]),!i.isEmpty(e)){l=[];for(var o=n.split(e),u=0;u<a.length;u++){var f=a[u];i.isDup(f)||(f=n.matches(f,o),f&&l.push(f))}i.cache.write(e,l,10)}t.trigger("after:flexdatalist.search",[e,a,l])}r(l)},matches:function(e,t){var a=$.extend({},e),r=[],n=i.options.get(),s=n.searchIn;if(t.length>0)for(var l=0;l<s.length;l++){var o=s[l];if(i.isDefined(e,o)&&e[o]){for(var u=e[o].toString(),f=u,c=this.split(u),d=0;d<t.length;d++){var p=t[d];this.find(p,c)&&(r.push(p),f=this.highlight(p,f))}f!==u&&(a[o+"_highlight"]=this.highlight(f))}}return 0===r.length||n.searchByWord&&r.length<t.length-1?!1:a},highlight:function(e,t){return t?t.replace(new RegExp(e,i.options.get("searchContain")?"ig":"i"),"|:|$&|::|"):(e=e.split("|:|").join('<span class="highlight">'),e.split("|::|").join("</span>"))},find:function(e,t){for(var a=i.options.get(),r=0;r<t.length;r++){var n=t[r];if(n=this.normalizeString(n),e=this.normalizeString(e),a.searchEqual)return n==e;if(a.searchContain?n.indexOf(e)>=0:0===n.indexOf(e))return!0}return!1},split:function(e){if("string"==typeof e&&(e=[$.trim(e)]),i.options.get("searchByWord"))for(var t=0;t<e.length;t++){var a=$.trim(e[t]);if(a.indexOf(" ")>0){var r=a.split(" ");$.merge(e,r)}}return e},normalizeString:function(e){if("string"==typeof e){var t=i.options.get("normalizeString");return"function"==typeof t&&(e=t(e)),e.toUpperCase()}return e}},this.results={show:function(e){var a=this,r=i.options.get();if(this.remove(!0),e){if(0===e.length)return void this.empty(r.noResultsText);var n=this.container();r.groupBy?(e=this.group(e),Object.keys(e).forEach(function(t){var s=e[t],l=r.groupBy,o=i.results.highlight(s[0],l,t);$("<li>").addClass("group").append($("<span>").addClass("group-name").html(o)).append($("<span>").addClass("group-item-count").text(" "+s.length)).appendTo(n);a.items(s,n)})):this.items(e,n);var s=n.find("li:not(.group)");s.on("click",function(){var e=$(this).data("item");e&&(i.fvalue.extract(e),a.remove(),t.trigger("select:flexdatalist",[e,r]))}).hover(function(){s.removeClass("active"),$(this).addClass("active")},function(){$(this).removeClass("active")}),r.focusFirstResult&&s.filter(":first").addClass("active")}},empty:function(e){if(!i.isEmpty(e)){var t=this.container(),a=l.val();e=e.split("{keyword}").join(a),$("<li>").addClass("item no-results").append(e).appendTo(t)}},items:function(e,a){var r=i.options.get("maxShownResults");t.trigger("show:flexdatalist.results",[e]);for(var n=0;n<e.length&&!(r>0&&r===n);n++)this.item(e[n]).appendTo(a);t.trigger("shown:flexdatalist.results",[e])},item:function(e){for(var t=$("<li>").data("item",e).addClass("item"),a=i.options.get(),r=a.visibleProperties,n=0;n<r.length;n++){var s=r[n];if((!a.groupBy||a.groupBy!==s)&&i.isDefined(e,s)){var l={};if(s===a.iconProperty)l=$("<img>").addClass("item item-"+s).attr("src",e[s]);else{var o=i.results.highlight(e,s);l=$("<span>").addClass("item item-"+s).html(o+" ")}l.appendTo(t)}}return t},container:function(){var e=t;o&&(e=o);var a=$("ul.flexdatalist-results");return 0===a.length&&(a=$("<ul>").addClass("flexdatalist-results").appendTo("body").css({"border-color":e.css("border-left-color"),"border-width":"1px","border-bottom-left-radius":e.css("border-bottom-left-radius"),"border-bottom-right-radius":e.css("border-bottom-right-radius")}).data({target:l,input:t}),i.position(l)),a},group:function(e){for(var t=[],a=i.options.get("groupBy"),r=0;r<e.length;r++){var n=e[r];if(i.isDefined(n,a)){var s=n[a];i.isDefined(t,s)||(t[s]=[]),t[s].push(n)}}return t},highlight:function(e,t,a){return i.isDefined(e,t+"_highlight")?e[t+"_highlight"]:i.isDefined(e,t)?e[t]:a},remove:function(e){var i="ul.flexdatalist-results";e&&(i="ul.flexdatalist-results li"),$(i).remove(),t.trigger("removed:flexdatalist.results")}},this.cache={write:function(e,t,a,r){if(i.cache.isSupported()){e=this.keyGen(e,void 0,r);var n={value:t,timestamp:i.unixtime(),lifetime:a?a:!1};localStorage.setItem(e,JSON.stringify(n))}},read:function(e,t){if(i.cache.isSupported()){e=this.keyGen(e,void 0,t);var a=localStorage.getItem(e);if(a){var r=JSON.parse(a);if(r.lifetime){var n=i.unixtime()-r.timestamp;return r.lifetime>n?r.value:(i.cache["delete"](e),null)}return r.value}}return null},"delete":function(e,t){i.cache.isSupported()&&(e=this.keyGen(e,void 0,t),localStorage.removeItem(e))},clear:function(){if(i.cache.isSupported()){for(var e in localStorage)(e.indexOf(s)>-1||e.indexOf("global")>-1)&&i.cache["delete"](e);localStorage.clear()}},isSupported:function(){if(i.options.get("cache"))try{return"localStorage"in window&&null!==window.localStorage}catch(e){return!1}return!1},keyGen:function(e,t,i){"object"==typeof e&&(e=JSON.stringify(e));var a,r,n=void 0===t?2166136261:t;for(a=0,r=e.length;r>a;a++)n^=e.charCodeAt(a),n+=(n<<1)+(n<<4)+(n<<7)+(n<<8)+(n<<24);return(i?"global":s)+("0000000"+(n>>>0).toString(16)).substr(-8)}},this.options={init:function(){var e=$.extend({},r,t.data(),{multiple:null===r.multiple?t.is("[multiple]"):r.multiple,disabled:null===r.disabled?t.is("[disabled]"):r.disabled,originalValue:t[0].value});this.set(e)},get:function(e){var a=t.data("flexdatalist");return e?i.isDefined(a,e)?a[e]:null:a},set:function(e,a){var r=this.get();return i.isDefined(r,e)&&i.isDefined(a)?r[e]=a:i.isObject(e)&&(r=this._normalize(e)),t.data("flexdatalist",r),t},_normalize:function(e){if(e.searchIn=i.csvToArray(e.searchIn),e.relatives=e.relatives&&$(e.relatives).length>0?$(e.relatives):null,e.textProperty=null===e.textProperty?e.searchIn[0]:e.textProperty,e.visibleProperties=i.csvToArray(e.visibleProperties,e.searchIn),"*"===e.valueProperty&&e.multiple&&!e.selectionRequired)throw new Error("Selection must be required for multiple, JSON fields!");return e}},this.position=function(){var e=l;o&&(e=o),$("ul.flexdatalist-results").css({width:e.outerWidth()+"px",top:e.offset().top+e.outerHeight()+"px",left:e.offset().left+"px"})},this.fdisabled=function(e){if(this.isDefined(e)){if(t.prop("disabled",e),l.prop("disabled",e),o){o.css("background-color",t.css("background-color"));var i=o.find("li .fdl-remove"),a=o.find("li.input-container");e?(o.addClass("disabled"),a.hide(),i.hide()):(o.removeClass("disabled"),a.show(),i.show())}this.options.set("disabled",e)}return this.options.get("disabled")},this.isDup=function(e){return this.options.get("allowDuplicateValues")?!1:n.length>0&&n.indexOf(this.fvalue.text(e))>-1},this.keyNum=function(e){return e.which||e.keyCode},this.isEmpty=function(e){return i.isDefined(e)?null===e?!0:e===!0?!1:0===this.length(e)?!0:""===$.trim(e):!0},this.isObject=function(e){return e&&"object"==typeof e},this.length=function(e){return this.isObject(e)?Object.keys(e).length:"number"==typeof e||"number"==typeof e.length?e.toString().length:0},this.isDefined=function(e,t){var i="undefined"!=typeof e;return i&&"undefined"!=typeof t?"undefined"!=typeof e[t]:i},this.unixtime=function(e){var t=new Date;return e&&(t=new Date(e)),Math.round(t.getTime()/1e3)},this.csvToArray=function(e,t){return 0===e.length?t:"string"==typeof e?e.split(i.options.get("valuesSeparator")):e},this.debug=function(e,a){var r=i.options.get();r.debug&&(a||(a={}),e="Flexdatalist: "+e,console.warn(e),console.log($.extend({inputName:t.attr("name"),options:r},a)),console.log("--- /flexdatalist ---"))},this.init()})},jQuery(function(e){var t=e(document);t.data("flexdatalist")||e(document).mouseup(function(t){var i=e(".flexdatalist-results"),a=i.data("target");a&&a.is(":focus")||i.is(t.target)||0!==i.has(t.target).length||i.remove()}).keydown(function(t){var i=e(".flexdatalist-results"),a=i.find("li"),r=a.filter(".active"),n=r.index(),s=a.length,l=t.which||t.keyCode;if(0!==s){if(27===l)return void i.remove();if(13===l)t.preventDefault(),r.click();else if(40===l||38===l){t.preventDefault(),40===l?r=s>n&&r.nextAll(".item").first().length>0?r.removeClass("active").nextAll(".item").first().addClass("active"):a.removeClass("active").filter(".item:first").addClass("active"):38===l&&(r=n>0&&r.prevAll(".item").first().length>0?r.removeClass("active").prevAll(".item").first().addClass("active"):a.removeClass("active").filter(".item:last").addClass("active"));var o=(0===r.prev().length?r:r.prev()).position().top;i.animate({scrollTop:o+i.scrollTop()},100)}}}).data("flexdatalist",!0),jQuery("input.flexdatalist:not(.flexdatalist-set)").flexdatalist()}),function(e){var t=e.fn.val;e.fn.val=function(i){var a=e(this).hasClass("flexdatalist");return"undefined"==typeof i?a?this[0].fvalue.get(!0):t.call(this):a?this[0].fvalue.set(i):t.call(this,i)}}(jQuery);
\ No newline at end of file
diff --git a/package.json b/package.json
index f08ddc2..c03e1c5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jQuery.Flexdatalist",
   "description": "jQuery Datalist Autocomplete plugin",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sergiodlopes/jquery-flexdatalist.git"