diff --git a/CHANGELOG.md b/CHANGELOG.md
index e559c92..6e2eab3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.2.19
+
+#### Features
+
+- **oi-select:** `maxlength` translate maxlength attribute on input
+
+- **oi-select-options:**
+    - maxlength is maximum number of characters allowed in the input
+    - groupFilter for customizing group header
+
 ## 0.2.18
 
 #### Bug Fixes
diff --git a/README.md b/README.md
index fd34719..532701a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 #oi.select — AngularJS directive of select element
 
-**[Download 0.2.18](https://github.com/tamtakoe/oi.select/tree/master/dist)**
+**[Download 0.2.19](https://github.com/tamtakoe/oi.select/tree/master/dist)**
 
 ## Features
 
@@ -93,6 +93,7 @@ Use `oi-select` directive:
   * `debounce` — timeout of debounced input field (default: 500). Set only if `value` is function which return promise
   * `searchFilter` — filter name for items in search field
   * `dropdownFilter` — filter name for items in dropdown
+  * `groupFilter` — filter name for group header
   * `listFilter` — filter name for items order in dropdown. Use `none` to disable filtering
   * `editItem` — function which get `lastQuery`, `removedItem` and `getLabel(item)` and return string for input after element was removed (default: ''). `editItem = true` allows you to edit a deleted item. `editItem = 'correct'` same as `true` but does not edit the first time
   * `saveTrigger` — Trigger on which element is stored in the model. May be `enter`, `blur`, `space`, `tab` and any characters devided by spaces (default: `enter tab blur`)
@@ -102,6 +103,7 @@ Use `oi-select` directive:
   * `newItemModel` — New items model (default: model = query). `$query` value from model will be changed to query string.
   * `newItemFn` — function which get query and return new item object or promise. F.e. `'addItem($query)'`
   * `removeItemFn` — function which get removed item model and return any value or promise. If promise was rejected, item wouldn't removed. F.e. `'removeItem($item)'`
+  * `maxlength` — maximum number of characters allowed in the input
 
 ### oiSelect service
  * `options` — default options which we can override in `oiSelectProvider.options`
diff --git a/bower.json b/bower.json
index 3d172f8..0b7c333 100644
--- a/bower.json
+++ b/bower.json
@@ -3,7 +3,7 @@
         "name": "https://github.com/tamtakoe"
     },
     "name": "oi.select",
-    "version": "0.2.18",
+    "version": "0.2.19",
     "main": ["./dist/select-tpls.min.js", "./dist/select.min.css"],
     "dependencies": {
         "angular": ">=1.2",
diff --git a/dist/select-tpls.js b/dist/select-tpls.js
index 00ef053..71fbe28 100644
--- a/dist/select-tpls.js
+++ b/dist/select-tpls.js
@@ -8,16 +8,17 @@ angular.module('oi.select')
             searchFilter:   'oiSelectCloseIcon',
             dropdownFilter: 'oiSelectHighlight',
             listFilter:     'oiSelectAscSort',
+            groupFilter:    'oiSelectGroup',
             editItem:       false,
             newItem:        false,
             closeList:      true,
             saveTrigger:    'enter tab blur'
         },
         version: {
-            full: '0.2.18',
+            full: '0.2.19',
             major: 0,
             minor: 2,
-            dot: 18
+            dot: 19
         },
         $get: function() {
             return {
@@ -60,7 +61,7 @@ angular.module('oi.select')
                 if (current === container) {
                     return false;
                 }
-                if (current.className.indexOf(className) >= 0) {
+                if (current.className.indexOf(className) >= 0) { //current.classList.contains(className) doesn't work in IE9
                     return true;
                 }
             } else {
@@ -428,6 +429,10 @@ angular.module('oi.select')
                 var listFilter = $filter(match[0]),
                     listFilterOptionsFn = $parse(match[1]);
 
+                match = options.groupFilter.split(':');
+                var groupFilter = $filter(match[0]),
+                    groupFilterOptionsFn = $parse(match[1]);
+
                 if (options.newItemFn) {
                     newItemFn = $parse(options.newItemFn);
 
@@ -458,6 +463,10 @@ angular.module('oi.select')
                     element[0].removeAttribute('tabindex');
                 }
 
+                if (options.maxlength) {
+                    inputElement.attr('maxlength', options.maxlength);
+                }
+
                 attrs.$observe('disabled', function(value) {
                     inputElement.prop('disabled', value);
 
@@ -632,7 +641,7 @@ angular.module('oi.select')
                             }
 
                             if (multiple || !scope.backspaceFocus) {
-                                scope.query = editItemFn(removedItem, lastQuery, getLabel, editItemIsCorrected) || '';
+                                scope.query = editItemFn(removedItem, lastQuery, getLabel, editItemIsCorrected, element) || '';
                             }
 
                             if (multiple && options.closeList) {
@@ -738,13 +747,17 @@ angular.module('oi.select')
                 scope.getSearchLabel = function(item) {
                     var label = getLabel(item);
 
-                    return searchFilter(label, scope.oldQuery || scope.query, item, searchFilterOptionsFn(scope.$parent));
+                    return searchFilter(label, scope.oldQuery || scope.query, item, searchFilterOptionsFn(scope.$parent), element);
                 };
 
                 scope.getDropdownLabel = function(item) {
                     var label = getLabel(item);
 
-                    return dropdownFilter(label, scope.oldQuery || scope.query, item, dropdownFilterOptionsFn(scope.$parent));
+                    return dropdownFilter(label, scope.oldQuery || scope.query, item, dropdownFilterOptionsFn(scope.$parent), element);
+                };
+
+                scope.getGroupLabel = function(group, items) {
+                    return groupFilter(group, scope.oldQuery || scope.query, items, groupFilterOptionsFn(scope.$parent), element);
                 };
 
                 scope.getDisableWhen = getDisableWhen;
@@ -927,7 +940,7 @@ angular.module('oi.select')
 
                                 if (values && !selectedAs) {
                                     var outputValues = multiple ? scope.output : [];
-                                    var filteredList = listFilter(oiUtils.objToArr(values), query, getLabel, listFilterOptionsFn(scope.$parent));
+                                    var filteredList = listFilter(oiUtils.objToArr(values), query, getLabel, listFilterOptionsFn(scope.$parent), element);
                                     var withoutIntersection = oiUtils.intersection(filteredList, outputValues, trackBy, trackBy, true);
                                     var filteredOutput = filter(withoutIntersection);
 
@@ -1025,6 +1038,12 @@ angular.module('oi.select')
 
 angular.module('oi.select')
 
+.filter('oiSelectGroup', ['$sce', function($sce) {
+    return function(label) {
+        return $sce.trustAsHtml(label);
+    };
+}])
+
 .filter('oiSelectCloseIcon', ['$sce', function($sce) {
     return function(label) {
         var closeIcon = '<span class="close select-search-list-item_selection-remove">×</span>';
@@ -1095,4 +1114,4 @@ angular.module('oi.select')
         return input;
     };
 });
-angular.module("oi.select").run(["$templateCache", function($templateCache) {$templateCache.put("src/template.html","<div class=select-search><ul class=select-search-list><li class=\"btn btn-default btn-xs select-search-list-item select-search-list-item_selection\" ng-hide=listItemHide ng-repeat=\"item in output track by $index\" ng-class=\"{focused: backspaceFocus && $last}\" ng-click=removeItem($index) ng-bind-html=getSearchLabel(item)></li><li class=\"select-search-list-item select-search-list-item_input\" ng-class=\"{\'select-search-list-item_hide\': inputHide}\"><input autocomplete=off ng-model=query ng-keyup=keyUp($event) ng-keydown=keyDown($event)></li><li class=\"select-search-list-item select-search-list-item_loader\" ng-show=showLoader></li></ul></div><div class=select-dropdown ng-show=isOpen><ul ng-if=isOpen class=select-dropdown-optgroup ng-repeat=\"(group, options) in groups\"><div class=select-dropdown-optgroup-header ng-if=\"group && options.length\" ng-bind=group></div><li class=select-dropdown-optgroup-option ng-init=\"isDisabled = getDisableWhen(option)\" ng-repeat=\"option in options\" ng-class=\"{\'active\': selectorPosition === groupPos[group] + $index, \'disabled\': isDisabled}\" ng-click=\"isDisabled || addItem(option)\" ng-mouseenter=\"setSelection(groupPos[group] + $index)\" ng-bind-html=getDropdownLabel(option)></li></ul></div>");}]);
\ No newline at end of file
+angular.module("oi.select").run(["$templateCache", function($templateCache) {$templateCache.put("src/template.html","<div class=select-search><ul class=select-search-list><li class=\"btn btn-default btn-xs select-search-list-item select-search-list-item_selection\" ng-hide=listItemHide ng-repeat=\"item in output track by $index\" ng-class=\"{focused: backspaceFocus && $last}\" ng-click=removeItem($index) ng-bind-html=getSearchLabel(item)></li><li class=\"select-search-list-item select-search-list-item_input\" ng-class=\"{\'select-search-list-item_hide\': inputHide}\"><input autocomplete=off ng-model=query ng-keyup=keyUp($event) ng-keydown=keyDown($event)></li><li class=\"select-search-list-item select-search-list-item_loader\" ng-show=showLoader></li></ul></div><div class=select-dropdown ng-show=isOpen><ul ng-if=isOpen class=select-dropdown-optgroup ng-repeat=\"(group, options) in groups\"><div class=select-dropdown-optgroup-header ng-if=\"group && options.length\" ng-bind-html=\"getGroupLabel(group, options)\"></div><li class=select-dropdown-optgroup-option ng-init=\"isDisabled = getDisableWhen(option)\" ng-repeat=\"option in options\" ng-class=\"{\'active\': selectorPosition === groupPos[group] + $index, \'disabled\': isDisabled, \'ungroup\': !group}\" ng-click=\"isDisabled || addItem(option)\" ng-mouseenter=\"setSelection(groupPos[group] + $index)\" ng-bind-html=getDropdownLabel(option)></li></ul></div>");}]);
\ No newline at end of file
diff --git a/dist/select-tpls.min.js b/dist/select-tpls.min.js
index e57cdde..04e1d86 100644
--- a/dist/select-tpls.min.js
+++ b/dist/select-tpls.min.js
@@ -1 +1 @@
-angular.module("oi.select",[]),angular.module("oi.select").provider("oiSelect",function(){return{options:{debounce:500,searchFilter:"oiSelectCloseIcon",dropdownFilter:"oiSelectHighlight",listFilter:"oiSelectAscSort",editItem:!1,newItem:!1,closeList:!0,saveTrigger:"enter tab blur"},version:{full:"0.2.18",major:0,minor:2,dot:18},$get:function(){return{options:this.options,version:this.version}}}}).factory("oiSelectEscape",function(){var e=/[-\/\\^$*+?.()|[\]{}]/g,t="\\$&";return function(n){return String(n).replace(e,t)}}).factory("oiSelectEditItem",function(){return function(e,t,n,o){return o?"":n(e)}}).factory("oiUtils",["$document","$timeout",function(e,t){function n(e,t,n){for(var o=t;o&&o.ownerDocument&&11!==o.nodeType;){if(n){if(o===e)return!1;if(o.className.indexOf(n)>=0)return!0}else if(o===e)return!0;o=o.parentNode}return!1}function o(o,r){function i(e){return e&&"INPUT"!==e.target.nodeName?void 0:(d=!1,c?void(d=!0):void t(function(){o.triggerHandler("blur")}))}function s(){a||(a=!0,t(function(){o.triggerHandler("focus")}))}function l(){c=!0}function u(e){c=!1;var s=e.target,l=n(o[0],s);d&&!l&&i(),l&&"INPUT"!==s.nodeName&&t(function(){r[0].focus()}),!l&&a&&(a=!1)}var a,c,d;return e[0].addEventListener("click",u,!0),o[0].addEventListener("mousedown",l,!0),o[0].addEventListener("blur",i,!0),r.on("focus",s),function(){e[0].removeEventListener("click",u),o[0].removeEventListener("mousedown",l,!0),o[0].removeEventListener("blur",i,!0),r.off("focus",s)}}function r(e,t){var n,o,r,i,l,a;t&&(o=e.offsetHeight,r=u(t,"height","margin"),i=e.scrollTop||0,n=s(t).top-s(e).top+i,l=n,a=n-o+r,n+r>o+i?e.scrollTop=a:i>n&&(e.scrollTop=l))}function i(e,t,n,o,r){function i(e){return parseFloat(r[e])}for(var s=n===(o?"border":"content")?4:"width"===t?1:0,l=0,u=["Top","Right","Bottom","Left"];4>s;s+=2)"margin"===n&&(l+=i(n+u[s])),o?("content"===n&&(l-=i("padding"+u[s])),"margin"!==n&&(l-=i("border"+u[s]+"Width"))):(l+=i("padding"+u[s]),"padding"!==n&&(l+=i("border"+u[s]+"Width")));return l}function s(e){var t,n,o=e.getBoundingClientRect(),r=e&&e.ownerDocument;if(r)return t=r.documentElement,n=l(r),{top:o.top+n.pageYOffset-t.clientTop,left:o.left+n.pageXOffset-t.clientLeft}}function l(e){return null!=e&&e===e.window?e:9===e.nodeType&&e.defaultView}function u(e,t,n){var o=!0,r="width"===t?e.offsetWidth:e.offsetHeight,s=window.getComputedStyle(e,null),l=!1;if(0>=r||null==r){if(r=s[t],(0>r||null==r)&&(r=e.style[t]),g.test(r))return r;r=parseFloat(r)||0}return r+i(e,t,n||(l?"border":"content"),o,s)}function a(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t].length)return!1;return!0}function c(e){var t=[];return angular.forEach(e,function(e,n){"$"!==n.toString().charAt(0)&&t.push(e)}),t}function d(e,t,n,o,r){var i,s,l,u,a,c=r?[].concat(e):[];for(i=0,l=e.length;i<e.length;i++)for(u=n?n(e[i]):e[i],s=0;s<t.length;s++)if(a=o?o(t[s]):t[s],angular.equals(u,a,e,t,i,s)){r?c.splice(i+c.length-l,1):c.push(t[s]);break}return c}function p(e,t,n,o){var r={};return e.split(".").reduce(function(e,n,o,r){return e[n]=o<r.length-1?{}:t},r),o(n,r)}var f=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,g=new RegExp("^("+f+")(?!px)[a-z%]+$","i");return{contains:n,bindFocusBlur:o,scrollActiveOption:r,groupsIsEmpty:a,objToArr:c,getValue:p,intersection:d}}]),angular.module("oi.select").directive("oiSelect",["$document","$q","$timeout","$parse","$interpolate","$injector","$filter","$animate","oiUtils","oiSelect",function(e,t,n,o,r,i,s,l,u,a){var c=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,d=/([^\(\)\s\|\s]*)\s*(\(.*\))?\s*(\|?\s*.+)?/;return{restrict:"AE",templateUrl:"src/template.html",require:"ngModel",scope:{},compile:function(e,p){var f=p.oiOptions,g=f?f.match(c):["","i","","","","i","","",""];if(!g)throw new Error("Expected expression in form of '_select_ (as _label_)? for (_key_,)?_value_ in _collection_'");var m,h,v,$,b,w,y,k,S=/ as /.test(g[0])&&g[1],I=g[2]||g[1],F=g[5]||g[7],V=g[3]||"",E=g[4]||"",q=g[9]||I,L=g[8].match(d),P=L[1],C=P+(L[3]||""),x=P+(L[2]||""),H=S&&o(S),O=o(I),A=o(V),D=o(E),T=o(C),_=o(x),N=o(q),M=r(p.multiplePlaceholder||""),Q=r(p.placeholder||""),U=o(p.oiSelectOptions),R=angular.version.major<=1&&angular.version.minor<=3;return function(e,r,c,d){function p(){at&&r.removeClass("cleanMode"),at=!1}function f(e,t){t=t||150,r.addClass(e),n(function(){r.removeClass(e)},t)}function S(){e.listItemHide=!0,e.inputHide=!1}function I(){var t=G(d.$modelValue);e.listItemHide=!t,e.inputHide=t}function V(t){u.contains(r[0],t.target,"disabled")||e.output.length>=y&&u.contains(r[0],t.target,"select-dropdown")||(e.inputHide&&e.removeItem(0),!e.isOpen||!lt.closeList||"INPUT"===t.target.nodeName&&e.query.length?J(e.query):(Z({query:lt.editItem&&!at}),e.$evalAsync()))}function E(){e.isFocused||(e.isFocused=!0,c.disabled||(e.backspaceFocus=!1))}function q(){e.isFocused=!1,w||I(),L("blur")||Z(),e.$evalAsync()}function L(o,r){r||(r=o,o=e.query);var i,s=lt.saveTrigger.split(" ").indexOf(r)+1,l=lt.newItem&&o,u="blur"!==r?e.order[e.selectorPosition]:null;return s&&(l||u)?(e.showLoader=!0,i=t.when(u||k(e.$parent,{$query:o})),i.then(function(o){if(void 0===o)return t.reject();e.addItem(o);var r=e.order.length-1;e.selectorPosition===r&&et(ot,0),lt.newItemFn&&!u||n(angular.noop),Z()}).catch(function(){f("invalid-item"),e.showLoader=!1}),!0):void 0}function C(){var e=w&&G(d.$modelValue)?it:rt;nt.attr("placeholder",e)}function x(t){return u.getValue(F,t,e.$parent,N)}function j(t){return u.getValue(F,t,e.$parent,H)}function W(t){return u.getValue(F,t,e.$parent,O)}function B(t){return u.getValue(F,t,e.$parent,D)}function z(t){return u.getValue(F,t,e.$parent,A)||""}function X(t){return u.getValue(P,t,e.$parent,T)}function Y(e){return e=e instanceof Array?e:e?[e]:[],e.filter(function(e){return e&&(e instanceof Array&&e.length||H||W(e))})}function G(e){return!!Y(e).length}function J(o,r){return v&&ct&&n.cancel(v),v=n(function(){var i=_(e.$parent,{$query:o,$selectedAs:r})||"";return e.selectorPosition="prompt"===lt.newItem?!1:0,o||r||(e.oldQuery=null),(i.$promise&&!i.$resolved||angular.isFunction(i.then))&&(ct=lt.debounce),e.showLoader=!0,t.when(i.$promise||i).then(function(t){if(e.groups={},t&&!r){var n=w?e.output:[],i=vt(u.objToArr(t),o,W,$t(e.$parent)),s=u.intersection(i,n,x,x,!0),l=X(s);e.groups=tt(l)}return K(),t}).finally(function(){e.showLoader=!1,lt.closeList&&!lt.cleanModel&&n(function(){et(ot,0)})})},ct)}function K(){var t,n,o,r=[],i=0;e.order=[],e.groupPos={};for(n in e.groups)e.groups.hasOwnProperty(n)&&"$"!=n.charAt(0)&&r.push(n);for(R&&r.sort(),t=0;t<r.length;t++)n=r[t],o=e.groups[n],e.order=e.order.concat(o),e.groupPos[n]=i,i+=o.length}function Z(t){t=t||{},e.oldQuery=null,e.backspaceFocus=!1,e.groups={},e.order=[],e.showLoader=!1,e.isOpen=!1,ct=0,t.query||(e.query=""),v&&n.cancel(v)}function et(t,n){e.selectorPosition=n,u.scrollActiveOption(t[0],t.find("li")[n])}function tt(e){for(var t,n,o={"":[]},r=0;r<e.length;r++)t=z(e[r]),(n=o[t])||(n=o[t]=[]),n.push(e[r]);return o}d.$isEmpty=function(e){return!G(e)};var nt=r.find("input"),ot=angular.element(r[0].querySelector(".select-dropdown")),rt=Q(e),it=M(e),st=U(e.$parent)||{},lt=angular.extend({cleanModel:"prompt"===st.newItem},a.options,st),ut=lt.editItem,at="correct"===ut,ct=0;(ut===!0||"correct"===ut)&&(ut="oiSelectEditItem");var dt=ut?i.get(ut):angular.noop,pt=o(lt.removeItemFn);g=lt.searchFilter.split(":");var ft=s(g[0]),gt=o(g[1]);g=lt.dropdownFilter.split(":");var mt=s(g[0]),ht=o(g[1]);g=lt.listFilter.split(":");var vt=s(g[0]),$t=o(g[1]);k=lt.newItemFn?o(lt.newItemFn):function(e,t){return(U(t)||{}).newItemModel||t.$query},!lt.cleanModel||ut&&!at||r.addClass("cleanMode");var bt=u.bindFocusBlur(r,nt);angular.isDefined(c.autofocus)&&n(function(){nt[0].focus()}),angular.isDefined(c.readonly)&&nt.attr("readonly",!0),angular.isDefined(c.tabindex)&&(nt.attr("tabindex",c.tabindex),r[0].removeAttribute("tabindex")),c.$observe("disabled",function(t){nt.prop("disabled",t),w&&d.$modelValue&&d.$modelValue.length&&(e.inputHide=t)}),e.$on("$destroy",bt),e.$parent.$watch(c.multipleLimit,function(e){y=Number(e)||1/0}),e.$parent.$watch(c.multiple,function(e){w=void 0===e?angular.isDefined(c.multiple):e,r[w?"addClass":"removeClass"]("multiple")}),e.$parent.$watch(c.ngModel,function(n,o){var r=Y(n),i=t.when(r);C(),G(o)&&n!==o&&p(),w||I(),H&&G(n)&&(i=J(null,n).then(function(e){return u.intersection(r,e,null,j)}),v=null),w&&c.disabled&&!G(n)&&(e.inputHide=!1),i.then(function(t){e.output=t,t.length!==r.length&&e.removeItem(t.length)})}),e.$watch("query",function(t,n){L(t.slice(0,-1),t.slice(-1))||(t===n||e.oldQuery&&!t||h||(ot[0].scrollTop=0,t?(J(t),e.oldQuery=null):w&&(Z(),h=!0)),h=!1)}),e.$watch("groups",function(t){u.groupsIsEmpty(t)?e.isOpen=!1:e.isOpen||c.disabled||(e.isOpen=!0,e.isFocused=!0)}),e.$watch("isFocused",function(e){l[e?"addClass":"removeClass"](r,"focused",!R&&{tempClasses:"focused-animate"})}),e.$watch("isOpen",function(e){l[e?"addClass":"removeClass"](r,"open",!R&&{tempClasses:"open-animate"})}),e.$watch("showLoader",function(e){l[e?"addClass":"removeClass"](r,"loading",!R&&{tempClasses:"loading-animate"})}),e.addItem=function(t){if($=e.query,!w||!u.intersection(e.output,[t],x,x).length){if(e.output.length>=y)return void f("limited");var n=e.groups[z(t)]=e.groups[z(t)]||[],o=H?j(t):t;n.splice(n.indexOf(t),1),w?d.$setViewValue(angular.isArray(d.$modelValue)?d.$modelValue.concat(o):[o]):(d.$setViewValue(o),I()),u.groupsIsEmpty(e.groups)&&(e.groups={}),w||lt.closeList||Z({query:!0}),p(),e.oldQuery=e.oldQuery||e.query,e.query="",e.backspaceFocus=!1}},e.removeItem=function(n){c.disabled||w&&0>n||(b=w?d.$modelValue[n]:d.$modelValue,t.when(pt(e.$parent,{$item:b})).then(function(){(w||e.inputHide)&&(w?(d.$modelValue.splice(n,1),d.$setViewValue([].concat(d.$modelValue))):(S(),lt.cleanModel&&d.$setViewValue(void 0)),(w||!e.backspaceFocus)&&(e.query=dt(b,$,W,at)||""),w&&lt.closeList&&Z({query:!0}))}))},e.setSelection=function(t){m||e.selectorPosition===t?m=!1:et(ot,t)},e.keyUp=function(t){switch(t.keyCode){case 8:e.query.length||w&&e.output.length||Z()}},e.keyDown=function(t){var n=0,o=e.order.length-1;switch(t.keyCode){case 38:e.selectorPosition=angular.isNumber(e.selectorPosition)?e.selectorPosition:n,et(ot,e.selectorPosition===n?o:e.selectorPosition-1),m=!0;break;case 40:e.selectorPosition=angular.isNumber(e.selectorPosition)?e.selectorPosition:n-1,et(ot,e.selectorPosition===o?n:e.selectorPosition+1),m=!0,e.query.length||e.isOpen||J(),e.inputHide&&S();break;case 37:case 39:break;case 9:L("tab");break;case 13:L("enter"),t.preventDefault();break;case 32:L("space");break;case 27:w||(I(),lt.cleanModel&&d.$setViewValue(b)),Z();break;case 8:if(!e.query.length){if((!w||ut)&&(e.backspaceFocus=!0),e.backspaceFocus&&e.output&&(!w||e.output.length)){e.removeItem(e.output.length-1),ut&&t.preventDefault();break}e.backspaceFocus=!e.backspaceFocus;break}default:return e.inputHide&&S(),e.backspaceFocus=!1,!1}},e.getSearchLabel=function(t){var n=W(t);return ft(n,e.oldQuery||e.query,t,gt(e.$parent))},e.getDropdownLabel=function(t){var n=W(t);return mt(n,e.oldQuery||e.query,t,ht(e.$parent))},e.getDisableWhen=B,Z(),r[0].addEventListener("click",V,!0),r.on("focus",E),r.on("blur",q)}}}}]),angular.module("oi.select").filter("oiSelectCloseIcon",["$sce",function(e){return function(t){var n='<span class="close select-search-list-item_selection-remove">×</span>';return e.trustAsHtml(t+n)}}]).filter("oiSelectHighlight",["$sce","oiSelectEscape",function(e,t){return function(n,o){var r;return o.length>0||angular.isNumber(o)?(n=n.toString(),o=t(o.toString()),r=n.replace(new RegExp(o,"gi"),"<strong>$&</strong>")):r=n,e.trustAsHtml(r)}}]).filter("oiSelectAscSort",["oiSelectEscape",function(e){function t(t,n,o,r){var i,s,l,u,a=[],c=[],d=[];if(n){for(n=e(String(n)),i=0,l=!1;i<t.length;i++){if(l=o(t[i]).match(new RegExp(n,"i")),!l&&r)for(s=0;s<r.length&&!l;s++)l=String(t[i][r[s]]).match(new RegExp(n,"i"));l&&a.push(t[i])}for(i=0;i<a.length;i++)o(a[i]).match(new RegExp("^"+n,"i"))?c.push(a[i]):d.push(a[i]);u=c.concat(d)}else u=[].concat(t);return u}return t}]).filter("none",function(){return function(e){return e}}),angular.module("oi.select").run(["$templateCache",function(e){e.put("src/template.html",'<div class=select-search><ul class=select-search-list><li class="btn btn-default btn-xs select-search-list-item select-search-list-item_selection" ng-hide=listItemHide ng-repeat="item in output track by $index" ng-class="{focused: backspaceFocus && $last}" ng-click=removeItem($index) ng-bind-html=getSearchLabel(item)></li><li class="select-search-list-item select-search-list-item_input" ng-class="{\'select-search-list-item_hide\': inputHide}"><input autocomplete=off ng-model=query ng-keyup=keyUp($event) ng-keydown=keyDown($event)></li><li class="select-search-list-item select-search-list-item_loader" ng-show=showLoader></li></ul></div><div class=select-dropdown ng-show=isOpen><ul ng-if=isOpen class=select-dropdown-optgroup ng-repeat="(group, options) in groups"><div class=select-dropdown-optgroup-header ng-if="group && options.length" ng-bind=group></div><li class=select-dropdown-optgroup-option ng-init="isDisabled = getDisableWhen(option)" ng-repeat="option in options" ng-class="{\'active\': selectorPosition === groupPos[group] + $index, \'disabled\': isDisabled}" ng-click="isDisabled || addItem(option)" ng-mouseenter="setSelection(groupPos[group] + $index)" ng-bind-html=getDropdownLabel(option)></li></ul></div>')}]);
\ No newline at end of file
+angular.module("oi.select",[]),angular.module("oi.select").provider("oiSelect",function(){return{options:{debounce:500,searchFilter:"oiSelectCloseIcon",dropdownFilter:"oiSelectHighlight",listFilter:"oiSelectAscSort",groupFilter:"oiSelectGroup",editItem:!1,newItem:!1,closeList:!0,saveTrigger:"enter tab blur"},version:{full:"0.2.19",major:0,minor:2,dot:19},$get:function(){return{options:this.options,version:this.version}}}}).factory("oiSelectEscape",function(){var e=/[-\/\\^$*+?.()|[\]{}]/g,t="\\$&";return function(n){return String(n).replace(e,t)}}).factory("oiSelectEditItem",function(){return function(e,t,n,o){return o?"":n(e)}}).factory("oiUtils",["$document","$timeout",function(e,t){function n(e,t,n){for(var o=t;o&&o.ownerDocument&&11!==o.nodeType;){if(n){if(o===e)return!1;if(o.className.indexOf(n)>=0)return!0}else if(o===e)return!0;o=o.parentNode}return!1}function o(o,r){function i(e){return e&&"INPUT"!==e.target.nodeName?void 0:(d=!1,c?void(d=!0):void t(function(){o.triggerHandler("blur")}))}function s(){a||(a=!0,t(function(){o.triggerHandler("focus")}))}function l(){c=!0}function u(e){c=!1;var s=e.target,l=n(o[0],s);d&&!l&&i(),l&&"INPUT"!==s.nodeName&&t(function(){r[0].focus()}),!l&&a&&(a=!1)}var a,c,d;return e[0].addEventListener("click",u,!0),o[0].addEventListener("mousedown",l,!0),o[0].addEventListener("blur",i,!0),r.on("focus",s),function(){e[0].removeEventListener("click",u),o[0].removeEventListener("mousedown",l,!0),o[0].removeEventListener("blur",i,!0),r.off("focus",s)}}function r(e,t){var n,o,r,i,l,a;t&&(o=e.offsetHeight,r=u(t,"height","margin"),i=e.scrollTop||0,n=s(t).top-s(e).top+i,l=n,a=n-o+r,n+r>o+i?e.scrollTop=a:i>n&&(e.scrollTop=l))}function i(e,t,n,o,r){function i(e){return parseFloat(r[e])}for(var s=n===(o?"border":"content")?4:"width"===t?1:0,l=0,u=["Top","Right","Bottom","Left"];4>s;s+=2)"margin"===n&&(l+=i(n+u[s])),o?("content"===n&&(l-=i("padding"+u[s])),"margin"!==n&&(l-=i("border"+u[s]+"Width"))):(l+=i("padding"+u[s]),"padding"!==n&&(l+=i("border"+u[s]+"Width")));return l}function s(e){var t,n,o=e.getBoundingClientRect(),r=e&&e.ownerDocument;if(r)return t=r.documentElement,n=l(r),{top:o.top+n.pageYOffset-t.clientTop,left:o.left+n.pageXOffset-t.clientLeft}}function l(e){return null!=e&&e===e.window?e:9===e.nodeType&&e.defaultView}function u(e,t,n){var o=!0,r="width"===t?e.offsetWidth:e.offsetHeight,s=window.getComputedStyle(e,null),l=!1;if(0>=r||null==r){if(r=s[t],(0>r||null==r)&&(r=e.style[t]),g.test(r))return r;r=parseFloat(r)||0}return r+i(e,t,n||(l?"border":"content"),o,s)}function a(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t].length)return!1;return!0}function c(e){var t=[];return angular.forEach(e,function(e,n){"$"!==n.toString().charAt(0)&&t.push(e)}),t}function d(e,t,n,o,r){var i,s,l,u,a,c=r?[].concat(e):[];for(i=0,l=e.length;i<e.length;i++)for(u=n?n(e[i]):e[i],s=0;s<t.length;s++)if(a=o?o(t[s]):t[s],angular.equals(u,a,e,t,i,s)){r?c.splice(i+c.length-l,1):c.push(t[s]);break}return c}function p(e,t,n,o){var r={};return e.split(".").reduce(function(e,n,o,r){return e[n]=o<r.length-1?{}:t},r),o(n,r)}var f=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,g=new RegExp("^("+f+")(?!px)[a-z%]+$","i");return{contains:n,bindFocusBlur:o,scrollActiveOption:r,groupsIsEmpty:a,objToArr:c,getValue:p,intersection:d}}]),angular.module("oi.select").directive("oiSelect",["$document","$q","$timeout","$parse","$interpolate","$injector","$filter","$animate","oiUtils","oiSelect",function(e,t,n,o,r,i,s,l,u,a){var c=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,d=/([^\(\)\s\|\s]*)\s*(\(.*\))?\s*(\|?\s*.+)?/;return{restrict:"AE",templateUrl:"src/template.html",require:"ngModel",scope:{},compile:function(e,p){var f=p.oiOptions,g=f?f.match(c):["","i","","","","i","","",""];if(!g)throw new Error("Expected expression in form of '_select_ (as _label_)? for (_key_,)?_value_ in _collection_'");var m,h,v,$,b,w,y,S,k=/ as /.test(g[0])&&g[1],I=g[2]||g[1],F=g[5]||g[7],L=g[3]||"",V=g[4]||"",q=g[9]||I,E=g[8].match(d),P=E[1],x=P+(E[3]||""),C=P+(E[2]||""),H=k&&o(k),O=o(I),A=o(L),D=o(V),T=o(x),_=o(C),N=o(q),M=r(p.multiplePlaceholder||""),Q=r(p.placeholder||""),U=o(p.oiSelectOptions),R=angular.version.major<=1&&angular.version.minor<=3;return function(e,r,c,d){function p(){at&&r.removeClass("cleanMode"),at=!1}function f(e,t){t=t||150,r.addClass(e),n(function(){r.removeClass(e)},t)}function k(){e.listItemHide=!0,e.inputHide=!1}function I(){var t=Y(d.$modelValue);e.listItemHide=!t,e.inputHide=t}function L(t){u.contains(r[0],t.target,"disabled")||e.output.length>=y&&u.contains(r[0],t.target,"select-dropdown")||(e.inputHide&&e.removeItem(0),!e.isOpen||!lt.closeList||"INPUT"===t.target.nodeName&&e.query.length?J(e.query):(Z({query:lt.editItem&&!at}),e.$evalAsync()))}function V(){e.isFocused||(e.isFocused=!0,c.disabled||(e.backspaceFocus=!1))}function q(){e.isFocused=!1,w||I(),E("blur")||Z(),e.$evalAsync()}function E(o,r){r||(r=o,o=e.query);var i,s=lt.saveTrigger.split(" ").indexOf(r)+1,l=lt.newItem&&o,u="blur"!==r?e.order[e.selectorPosition]:null;return s&&(l||u)?(e.showLoader=!0,i=t.when(u||S(e.$parent,{$query:o})),i.then(function(o){if(void 0===o)return t.reject();e.addItem(o);var r=e.order.length-1;e.selectorPosition===r&&et(ot,0),lt.newItemFn&&!u||n(angular.noop),Z()}).catch(function(){f("invalid-item"),e.showLoader=!1}),!0):void 0}function x(){var e=w&&Y(d.$modelValue)?it:rt;nt.attr("placeholder",e)}function C(t){return u.getValue(F,t,e.$parent,N)}function j(t){return u.getValue(F,t,e.$parent,H)}function W(t){return u.getValue(F,t,e.$parent,O)}function B(t){return u.getValue(F,t,e.$parent,D)}function G(t){return u.getValue(F,t,e.$parent,A)||""}function z(t){return u.getValue(P,t,e.$parent,T)}function X(e){return e=e instanceof Array?e:e?[e]:[],e.filter(function(e){return e&&(e instanceof Array&&e.length||H||W(e))})}function Y(e){return!!X(e).length}function J(o,i){return v&&ct&&n.cancel(v),v=n(function(){var s=_(e.$parent,{$query:o,$selectedAs:i})||"";return e.selectorPosition="prompt"===lt.newItem?!1:0,o||i||(e.oldQuery=null),(s.$promise&&!s.$resolved||angular.isFunction(s.then))&&(ct=lt.debounce),e.showLoader=!0,t.when(s.$promise||s).then(function(t){if(e.groups={},t&&!i){var n=w?e.output:[],s=vt(u.objToArr(t),o,W,$t(e.$parent),r),l=u.intersection(s,n,C,C,!0),a=z(l);e.groups=tt(a)}return K(),t}).finally(function(){e.showLoader=!1,lt.closeList&&!lt.cleanModel&&n(function(){et(ot,0)})})},ct)}function K(){var t,n,o,r=[],i=0;e.order=[],e.groupPos={};for(n in e.groups)e.groups.hasOwnProperty(n)&&"$"!=n.charAt(0)&&r.push(n);for(R&&r.sort(),t=0;t<r.length;t++)n=r[t],o=e.groups[n],e.order=e.order.concat(o),e.groupPos[n]=i,i+=o.length}function Z(t){t=t||{},e.oldQuery=null,e.backspaceFocus=!1,e.groups={},e.order=[],e.showLoader=!1,e.isOpen=!1,ct=0,t.query||(e.query=""),v&&n.cancel(v)}function et(t,n){e.selectorPosition=n,u.scrollActiveOption(t[0],t.find("li")[n])}function tt(e){for(var t,n,o={"":[]},r=0;r<e.length;r++)t=G(e[r]),(n=o[t])||(n=o[t]=[]),n.push(e[r]);return o}d.$isEmpty=function(e){return!Y(e)};var nt=r.find("input"),ot=angular.element(r[0].querySelector(".select-dropdown")),rt=Q(e),it=M(e),st=U(e.$parent)||{},lt=angular.extend({cleanModel:"prompt"===st.newItem},a.options,st),ut=lt.editItem,at="correct"===ut,ct=0;(ut===!0||"correct"===ut)&&(ut="oiSelectEditItem");var dt=ut?i.get(ut):angular.noop,pt=o(lt.removeItemFn);g=lt.searchFilter.split(":");var ft=s(g[0]),gt=o(g[1]);g=lt.dropdownFilter.split(":");var mt=s(g[0]),ht=o(g[1]);g=lt.listFilter.split(":");var vt=s(g[0]),$t=o(g[1]);g=lt.groupFilter.split(":");var bt=s(g[0]),wt=o(g[1]);S=lt.newItemFn?o(lt.newItemFn):function(e,t){return(U(t)||{}).newItemModel||t.$query},!lt.cleanModel||ut&&!at||r.addClass("cleanMode");var yt=u.bindFocusBlur(r,nt);angular.isDefined(c.autofocus)&&n(function(){nt[0].focus()}),angular.isDefined(c.readonly)&&nt.attr("readonly",!0),angular.isDefined(c.tabindex)&&(nt.attr("tabindex",c.tabindex),r[0].removeAttribute("tabindex")),lt.maxlength&&nt.attr("maxlength",lt.maxlength),c.$observe("disabled",function(t){nt.prop("disabled",t),w&&d.$modelValue&&d.$modelValue.length&&(e.inputHide=t)}),e.$on("$destroy",yt),e.$parent.$watch(c.multipleLimit,function(e){y=Number(e)||1/0}),e.$parent.$watch(c.multiple,function(e){w=void 0===e?angular.isDefined(c.multiple):e,r[w?"addClass":"removeClass"]("multiple")}),e.$parent.$watch(c.ngModel,function(n,o){var r=X(n),i=t.when(r);x(),Y(o)&&n!==o&&p(),w||I(),H&&Y(n)&&(i=J(null,n).then(function(e){return u.intersection(r,e,null,j)}),v=null),w&&c.disabled&&!Y(n)&&(e.inputHide=!1),i.then(function(t){e.output=t,t.length!==r.length&&e.removeItem(t.length)})}),e.$watch("query",function(t,n){E(t.slice(0,-1),t.slice(-1))||(t===n||e.oldQuery&&!t||h||(ot[0].scrollTop=0,t?(J(t),e.oldQuery=null):w&&(Z(),h=!0)),h=!1)}),e.$watch("groups",function(t){u.groupsIsEmpty(t)?e.isOpen=!1:e.isOpen||c.disabled||(e.isOpen=!0,e.isFocused=!0)}),e.$watch("isFocused",function(e){l[e?"addClass":"removeClass"](r,"focused",!R&&{tempClasses:"focused-animate"})}),e.$watch("isOpen",function(e){l[e?"addClass":"removeClass"](r,"open",!R&&{tempClasses:"open-animate"})}),e.$watch("showLoader",function(e){l[e?"addClass":"removeClass"](r,"loading",!R&&{tempClasses:"loading-animate"})}),e.addItem=function(t){if($=e.query,!w||!u.intersection(e.output,[t],C,C).length){if(e.output.length>=y)return void f("limited");var n=e.groups[G(t)]=e.groups[G(t)]||[],o=H?j(t):t;n.splice(n.indexOf(t),1),w?d.$setViewValue(angular.isArray(d.$modelValue)?d.$modelValue.concat(o):[o]):(d.$setViewValue(o),I()),u.groupsIsEmpty(e.groups)&&(e.groups={}),w||lt.closeList||Z({query:!0}),p(),e.oldQuery=e.oldQuery||e.query,e.query="",e.backspaceFocus=!1}},e.removeItem=function(n){c.disabled||w&&0>n||(b=w?d.$modelValue[n]:d.$modelValue,t.when(pt(e.$parent,{$item:b})).then(function(){(w||e.inputHide)&&(w?(d.$modelValue.splice(n,1),d.$setViewValue([].concat(d.$modelValue))):(k(),lt.cleanModel&&d.$setViewValue(void 0)),(w||!e.backspaceFocus)&&(e.query=dt(b,$,W,at,r)||""),w&&lt.closeList&&Z({query:!0}))}))},e.setSelection=function(t){m||e.selectorPosition===t?m=!1:et(ot,t)},e.keyUp=function(t){switch(t.keyCode){case 8:e.query.length||w&&e.output.length||Z()}},e.keyDown=function(t){var n=0,o=e.order.length-1;switch(t.keyCode){case 38:e.selectorPosition=angular.isNumber(e.selectorPosition)?e.selectorPosition:n,et(ot,e.selectorPosition===n?o:e.selectorPosition-1),m=!0;break;case 40:e.selectorPosition=angular.isNumber(e.selectorPosition)?e.selectorPosition:n-1,et(ot,e.selectorPosition===o?n:e.selectorPosition+1),m=!0,e.query.length||e.isOpen||J(),e.inputHide&&k();break;case 37:case 39:break;case 9:E("tab");break;case 13:E("enter"),t.preventDefault();break;case 32:E("space");break;case 27:w||(I(),lt.cleanModel&&d.$setViewValue(b)),Z();break;case 8:if(!e.query.length){if((!w||ut)&&(e.backspaceFocus=!0),e.backspaceFocus&&e.output&&(!w||e.output.length)){e.removeItem(e.output.length-1),ut&&t.preventDefault();break}e.backspaceFocus=!e.backspaceFocus;break}default:return e.inputHide&&k(),e.backspaceFocus=!1,!1}},e.getSearchLabel=function(t){var n=W(t);return ft(n,e.oldQuery||e.query,t,gt(e.$parent),r)},e.getDropdownLabel=function(t){var n=W(t);return mt(n,e.oldQuery||e.query,t,ht(e.$parent),r)},e.getGroupLabel=function(t,n){return bt(t,e.oldQuery||e.query,n,wt(e.$parent),r)},e.getDisableWhen=B,Z(),r[0].addEventListener("click",L,!0),r.on("focus",V),r.on("blur",q)}}}}]),angular.module("oi.select").filter("oiSelectGroup",["$sce",function(e){return function(t){return e.trustAsHtml(t)}}]).filter("oiSelectCloseIcon",["$sce",function(e){return function(t){var n='<span class="close select-search-list-item_selection-remove">×</span>';return e.trustAsHtml(t+n)}}]).filter("oiSelectHighlight",["$sce","oiSelectEscape",function(e,t){return function(n,o){var r;return o.length>0||angular.isNumber(o)?(n=n.toString(),o=t(o.toString()),r=n.replace(new RegExp(o,"gi"),"<strong>$&</strong>")):r=n,e.trustAsHtml(r)}}]).filter("oiSelectAscSort",["oiSelectEscape",function(e){function t(t,n,o,r){var i,s,l,u,a=[],c=[],d=[];if(n){for(n=e(String(n)),i=0,l=!1;i<t.length;i++){if(l=o(t[i]).match(new RegExp(n,"i")),!l&&r)for(s=0;s<r.length&&!l;s++)l=String(t[i][r[s]]).match(new RegExp(n,"i"));l&&a.push(t[i])}for(i=0;i<a.length;i++)o(a[i]).match(new RegExp("^"+n,"i"))?c.push(a[i]):d.push(a[i]);u=c.concat(d)}else u=[].concat(t);return u}return t}]).filter("none",function(){return function(e){return e}}),angular.module("oi.select").run(["$templateCache",function(e){e.put("src/template.html",'<div class=select-search><ul class=select-search-list><li class="btn btn-default btn-xs select-search-list-item select-search-list-item_selection" ng-hide=listItemHide ng-repeat="item in output track by $index" ng-class="{focused: backspaceFocus && $last}" ng-click=removeItem($index) ng-bind-html=getSearchLabel(item)></li><li class="select-search-list-item select-search-list-item_input" ng-class="{\'select-search-list-item_hide\': inputHide}"><input autocomplete=off ng-model=query ng-keyup=keyUp($event) ng-keydown=keyDown($event)></li><li class="select-search-list-item select-search-list-item_loader" ng-show=showLoader></li></ul></div><div class=select-dropdown ng-show=isOpen><ul ng-if=isOpen class=select-dropdown-optgroup ng-repeat="(group, options) in groups"><div class=select-dropdown-optgroup-header ng-if="group && options.length" ng-bind-html="getGroupLabel(group, options)"></div><li class=select-dropdown-optgroup-option ng-init="isDisabled = getDisableWhen(option)" ng-repeat="option in options" ng-class="{\'active\': selectorPosition === groupPos[group] + $index, \'disabled\': isDisabled, \'ungroup\': !group}" ng-click="isDisabled || addItem(option)" ng-mouseenter="setSelection(groupPos[group] + $index)" ng-bind-html=getDropdownLabel(option)></li></ul></div>')}]);
\ No newline at end of file
diff --git a/dist/select.js b/dist/select.js
index 24538a1..c21caf8 100644
--- a/dist/select.js
+++ b/dist/select.js
@@ -8,16 +8,17 @@ angular.module('oi.select')
             searchFilter:   'oiSelectCloseIcon',
             dropdownFilter: 'oiSelectHighlight',
             listFilter:     'oiSelectAscSort',
+            groupFilter:    'oiSelectGroup',
             editItem:       false,
             newItem:        false,
             closeList:      true,
             saveTrigger:    'enter tab blur'
         },
         version: {
-            full: '0.2.18',
+            full: '0.2.19',
             major: 0,
             minor: 2,
-            dot: 18
+            dot: 19
         },
         $get: function() {
             return {
@@ -60,7 +61,7 @@ angular.module('oi.select')
                 if (current === container) {
                     return false;
                 }
-                if (current.className.indexOf(className) >= 0) {
+                if (current.className.indexOf(className) >= 0) { //current.classList.contains(className) doesn't work in IE9
                     return true;
                 }
             } else {
@@ -428,6 +429,10 @@ angular.module('oi.select')
                 var listFilter = $filter(match[0]),
                     listFilterOptionsFn = $parse(match[1]);
 
+                match = options.groupFilter.split(':');
+                var groupFilter = $filter(match[0]),
+                    groupFilterOptionsFn = $parse(match[1]);
+
                 if (options.newItemFn) {
                     newItemFn = $parse(options.newItemFn);
 
@@ -458,6 +463,10 @@ angular.module('oi.select')
                     element[0].removeAttribute('tabindex');
                 }
 
+                if (options.maxlength) {
+                    inputElement.attr('maxlength', options.maxlength);
+                }
+
                 attrs.$observe('disabled', function(value) {
                     inputElement.prop('disabled', value);
 
@@ -632,7 +641,7 @@ angular.module('oi.select')
                             }
 
                             if (multiple || !scope.backspaceFocus) {
-                                scope.query = editItemFn(removedItem, lastQuery, getLabel, editItemIsCorrected) || '';
+                                scope.query = editItemFn(removedItem, lastQuery, getLabel, editItemIsCorrected, element) || '';
                             }
 
                             if (multiple && options.closeList) {
@@ -738,13 +747,17 @@ angular.module('oi.select')
                 scope.getSearchLabel = function(item) {
                     var label = getLabel(item);
 
-                    return searchFilter(label, scope.oldQuery || scope.query, item, searchFilterOptionsFn(scope.$parent));
+                    return searchFilter(label, scope.oldQuery || scope.query, item, searchFilterOptionsFn(scope.$parent), element);
                 };
 
                 scope.getDropdownLabel = function(item) {
                     var label = getLabel(item);
 
-                    return dropdownFilter(label, scope.oldQuery || scope.query, item, dropdownFilterOptionsFn(scope.$parent));
+                    return dropdownFilter(label, scope.oldQuery || scope.query, item, dropdownFilterOptionsFn(scope.$parent), element);
+                };
+
+                scope.getGroupLabel = function(group, items) {
+                    return groupFilter(group, scope.oldQuery || scope.query, items, groupFilterOptionsFn(scope.$parent), element);
                 };
 
                 scope.getDisableWhen = getDisableWhen;
@@ -927,7 +940,7 @@ angular.module('oi.select')
 
                                 if (values && !selectedAs) {
                                     var outputValues = multiple ? scope.output : [];
-                                    var filteredList = listFilter(oiUtils.objToArr(values), query, getLabel, listFilterOptionsFn(scope.$parent));
+                                    var filteredList = listFilter(oiUtils.objToArr(values), query, getLabel, listFilterOptionsFn(scope.$parent), element);
                                     var withoutIntersection = oiUtils.intersection(filteredList, outputValues, trackBy, trackBy, true);
                                     var filteredOutput = filter(withoutIntersection);
 
@@ -1025,6 +1038,12 @@ angular.module('oi.select')
 
 angular.module('oi.select')
 
+.filter('oiSelectGroup', ['$sce', function($sce) {
+    return function(label) {
+        return $sce.trustAsHtml(label);
+    };
+}])
+
 .filter('oiSelectCloseIcon', ['$sce', function($sce) {
     return function(label) {
         var closeIcon = '<span class="close select-search-list-item_selection-remove">×</span>';
diff --git a/dist/select.min.js b/dist/select.min.js
index bd20b64..d6cb2f2 100644
--- a/dist/select.min.js
+++ b/dist/select.min.js
@@ -1 +1 @@
-angular.module("oi.select",[]),angular.module("oi.select").provider("oiSelect",function(){return{options:{debounce:500,searchFilter:"oiSelectCloseIcon",dropdownFilter:"oiSelectHighlight",listFilter:"oiSelectAscSort",editItem:!1,newItem:!1,closeList:!0,saveTrigger:"enter tab blur"},version:{full:"0.2.18",major:0,minor:2,dot:18},$get:function(){return{options:this.options,version:this.version}}}}).factory("oiSelectEscape",function(){var e=/[-\/\\^$*+?.()|[\]{}]/g,t="\\$&";return function(n){return String(n).replace(e,t)}}).factory("oiSelectEditItem",function(){return function(e,t,n,r){return r?"":n(e)}}).factory("oiUtils",["$document","$timeout",function(e,t){function n(e,t,n){for(var r=t;r&&r.ownerDocument&&11!==r.nodeType;){if(n){if(r===e)return!1;if(r.className.indexOf(n)>=0)return!0}else if(r===e)return!0;r=r.parentNode}return!1}function r(r,o){function i(e){return e&&"INPUT"!==e.target.nodeName?void 0:(d=!1,c?void(d=!0):void t(function(){r.triggerHandler("blur")}))}function u(){a||(a=!0,t(function(){r.triggerHandler("focus")}))}function s(){c=!0}function l(e){c=!1;var u=e.target,s=n(r[0],u);d&&!s&&i(),s&&"INPUT"!==u.nodeName&&t(function(){o[0].focus()}),!s&&a&&(a=!1)}var a,c,d;return e[0].addEventListener("click",l,!0),r[0].addEventListener("mousedown",s,!0),r[0].addEventListener("blur",i,!0),o.on("focus",u),function(){e[0].removeEventListener("click",l),r[0].removeEventListener("mousedown",s,!0),r[0].removeEventListener("blur",i,!0),o.off("focus",u)}}function o(e,t){var n,r,o,i,s,a;t&&(r=e.offsetHeight,o=l(t,"height","margin"),i=e.scrollTop||0,n=u(t).top-u(e).top+i,s=n,a=n-r+o,n+o>r+i?e.scrollTop=a:i>n&&(e.scrollTop=s))}function i(e,t,n,r,o){function i(e){return parseFloat(o[e])}for(var u=n===(r?"border":"content")?4:"width"===t?1:0,s=0,l=["Top","Right","Bottom","Left"];4>u;u+=2)"margin"===n&&(s+=i(n+l[u])),r?("content"===n&&(s-=i("padding"+l[u])),"margin"!==n&&(s-=i("border"+l[u]+"Width"))):(s+=i("padding"+l[u]),"padding"!==n&&(s+=i("border"+l[u]+"Width")));return s}function u(e){var t,n,r=e.getBoundingClientRect(),o=e&&e.ownerDocument;if(o)return t=o.documentElement,n=s(o),{top:r.top+n.pageYOffset-t.clientTop,left:r.left+n.pageXOffset-t.clientLeft}}function s(e){return null!=e&&e===e.window?e:9===e.nodeType&&e.defaultView}function l(e,t,n){var r=!0,o="width"===t?e.offsetWidth:e.offsetHeight,u=window.getComputedStyle(e,null),s=!1;if(0>=o||null==o){if(o=u[t],(0>o||null==o)&&(o=e.style[t]),g.test(o))return o;o=parseFloat(o)||0}return o+i(e,t,n||(s?"border":"content"),r,u)}function a(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t].length)return!1;return!0}function c(e){var t=[];return angular.forEach(e,function(e,n){"$"!==n.toString().charAt(0)&&t.push(e)}),t}function d(e,t,n,r,o){var i,u,s,l,a,c=o?[].concat(e):[];for(i=0,s=e.length;i<e.length;i++)for(l=n?n(e[i]):e[i],u=0;u<t.length;u++)if(a=r?r(t[u]):t[u],angular.equals(l,a,e,t,i,u)){o?c.splice(i+c.length-s,1):c.push(t[u]);break}return c}function f(e,t,n,r){var o={};return e.split(".").reduce(function(e,n,r,o){return e[n]=r<o.length-1?{}:t},o),r(n,o)}var p=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,g=new RegExp("^("+p+")(?!px)[a-z%]+$","i");return{contains:n,bindFocusBlur:r,scrollActiveOption:o,groupsIsEmpty:a,objToArr:c,getValue:f,intersection:d}}]),angular.module("oi.select").directive("oiSelect",["$document","$q","$timeout","$parse","$interpolate","$injector","$filter","$animate","oiUtils","oiSelect",function(e,t,n,r,o,i,u,s,l,a){var c=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,d=/([^\(\)\s\|\s]*)\s*(\(.*\))?\s*(\|?\s*.+)?/;return{restrict:"AE",templateUrl:"src/template.html",require:"ngModel",scope:{},compile:function(e,f){var p=f.oiOptions,g=p?p.match(c):["","i","","","","i","","",""];if(!g)throw new Error("Expected expression in form of '_select_ (as _label_)? for (_key_,)?_value_ in _collection_'");var m,h,v,$,w,b,y,S,I=/ as /.test(g[0])&&g[1],F=g[2]||g[1],k=g[5]||g[7],V=g[3]||"",E=g[4]||"",q=g[9]||F,L=g[8].match(d),P=L[1],C=P+(L[3]||""),A=P+(L[2]||""),H=I&&r(I),O=r(F),x=r(V),T=r(E),N=r(C),D=r(A),_=r(q),M=o(f.multiplePlaceholder||""),Q=o(f.placeholder||""),R=r(f.oiSelectOptions),U=angular.version.major<=1&&angular.version.minor<=3;return function(e,o,c,d){function f(){at&&o.removeClass("cleanMode"),at=!1}function p(e,t){t=t||150,o.addClass(e),n(function(){o.removeClass(e)},t)}function I(){e.listItemHide=!0,e.inputHide=!1}function F(){var t=G(d.$modelValue);e.listItemHide=!t,e.inputHide=t}function V(t){l.contains(o[0],t.target,"disabled")||e.output.length>=y&&l.contains(o[0],t.target,"select-dropdown")||(e.inputHide&&e.removeItem(0),!e.isOpen||!st.closeList||"INPUT"===t.target.nodeName&&e.query.length?J(e.query):(Z({query:st.editItem&&!at}),e.$evalAsync()))}function E(){e.isFocused||(e.isFocused=!0,c.disabled||(e.backspaceFocus=!1))}function q(){e.isFocused=!1,b||F(),L("blur")||Z(),e.$evalAsync()}function L(r,o){o||(o=r,r=e.query);var i,u=st.saveTrigger.split(" ").indexOf(o)+1,s=st.newItem&&r,l="blur"!==o?e.order[e.selectorPosition]:null;return u&&(s||l)?(e.showLoader=!0,i=t.when(l||S(e.$parent,{$query:r})),i.then(function(r){if(void 0===r)return t.reject();e.addItem(r);var o=e.order.length-1;e.selectorPosition===o&&et(rt,0),st.newItemFn&&!l||n(angular.noop),Z()}).catch(function(){p("invalid-item"),e.showLoader=!1}),!0):void 0}function C(){var e=b&&G(d.$modelValue)?it:ot;nt.attr("placeholder",e)}function A(t){return l.getValue(k,t,e.$parent,_)}function j(t){return l.getValue(k,t,e.$parent,H)}function B(t){return l.getValue(k,t,e.$parent,O)}function W(t){return l.getValue(k,t,e.$parent,T)}function z(t){return l.getValue(k,t,e.$parent,x)||""}function X(t){return l.getValue(P,t,e.$parent,N)}function Y(e){return e=e instanceof Array?e:e?[e]:[],e.filter(function(e){return e&&(e instanceof Array&&e.length||H||B(e))})}function G(e){return!!Y(e).length}function J(r,o){return v&&ct&&n.cancel(v),v=n(function(){var i=D(e.$parent,{$query:r,$selectedAs:o})||"";return e.selectorPosition="prompt"===st.newItem?!1:0,r||o||(e.oldQuery=null),(i.$promise&&!i.$resolved||angular.isFunction(i.then))&&(ct=st.debounce),e.showLoader=!0,t.when(i.$promise||i).then(function(t){if(e.groups={},t&&!o){var n=b?e.output:[],i=vt(l.objToArr(t),r,B,$t(e.$parent)),u=l.intersection(i,n,A,A,!0),s=X(u);e.groups=tt(s)}return K(),t}).finally(function(){e.showLoader=!1,st.closeList&&!st.cleanModel&&n(function(){et(rt,0)})})},ct)}function K(){var t,n,r,o=[],i=0;e.order=[],e.groupPos={};for(n in e.groups)e.groups.hasOwnProperty(n)&&"$"!=n.charAt(0)&&o.push(n);for(U&&o.sort(),t=0;t<o.length;t++)n=o[t],r=e.groups[n],e.order=e.order.concat(r),e.groupPos[n]=i,i+=r.length}function Z(t){t=t||{},e.oldQuery=null,e.backspaceFocus=!1,e.groups={},e.order=[],e.showLoader=!1,e.isOpen=!1,ct=0,t.query||(e.query=""),v&&n.cancel(v)}function et(t,n){e.selectorPosition=n,l.scrollActiveOption(t[0],t.find("li")[n])}function tt(e){for(var t,n,r={"":[]},o=0;o<e.length;o++)t=z(e[o]),(n=r[t])||(n=r[t]=[]),n.push(e[o]);return r}d.$isEmpty=function(e){return!G(e)};var nt=o.find("input"),rt=angular.element(o[0].querySelector(".select-dropdown")),ot=Q(e),it=M(e),ut=R(e.$parent)||{},st=angular.extend({cleanModel:"prompt"===ut.newItem},a.options,ut),lt=st.editItem,at="correct"===lt,ct=0;(lt===!0||"correct"===lt)&&(lt="oiSelectEditItem");var dt=lt?i.get(lt):angular.noop,ft=r(st.removeItemFn);g=st.searchFilter.split(":");var pt=u(g[0]),gt=r(g[1]);g=st.dropdownFilter.split(":");var mt=u(g[0]),ht=r(g[1]);g=st.listFilter.split(":");var vt=u(g[0]),$t=r(g[1]);S=st.newItemFn?r(st.newItemFn):function(e,t){return(R(t)||{}).newItemModel||t.$query},!st.cleanModel||lt&&!at||o.addClass("cleanMode");var wt=l.bindFocusBlur(o,nt);angular.isDefined(c.autofocus)&&n(function(){nt[0].focus()}),angular.isDefined(c.readonly)&&nt.attr("readonly",!0),angular.isDefined(c.tabindex)&&(nt.attr("tabindex",c.tabindex),o[0].removeAttribute("tabindex")),c.$observe("disabled",function(t){nt.prop("disabled",t),b&&d.$modelValue&&d.$modelValue.length&&(e.inputHide=t)}),e.$on("$destroy",wt),e.$parent.$watch(c.multipleLimit,function(e){y=Number(e)||1/0}),e.$parent.$watch(c.multiple,function(e){b=void 0===e?angular.isDefined(c.multiple):e,o[b?"addClass":"removeClass"]("multiple")}),e.$parent.$watch(c.ngModel,function(n,r){var o=Y(n),i=t.when(o);C(),G(r)&&n!==r&&f(),b||F(),H&&G(n)&&(i=J(null,n).then(function(e){return l.intersection(o,e,null,j)}),v=null),b&&c.disabled&&!G(n)&&(e.inputHide=!1),i.then(function(t){e.output=t,t.length!==o.length&&e.removeItem(t.length)})}),e.$watch("query",function(t,n){L(t.slice(0,-1),t.slice(-1))||(t===n||e.oldQuery&&!t||h||(rt[0].scrollTop=0,t?(J(t),e.oldQuery=null):b&&(Z(),h=!0)),h=!1)}),e.$watch("groups",function(t){l.groupsIsEmpty(t)?e.isOpen=!1:e.isOpen||c.disabled||(e.isOpen=!0,e.isFocused=!0)}),e.$watch("isFocused",function(e){s[e?"addClass":"removeClass"](o,"focused",!U&&{tempClasses:"focused-animate"})}),e.$watch("isOpen",function(e){s[e?"addClass":"removeClass"](o,"open",!U&&{tempClasses:"open-animate"})}),e.$watch("showLoader",function(e){s[e?"addClass":"removeClass"](o,"loading",!U&&{tempClasses:"loading-animate"})}),e.addItem=function(t){if($=e.query,!b||!l.intersection(e.output,[t],A,A).length){if(e.output.length>=y)return void p("limited");var n=e.groups[z(t)]=e.groups[z(t)]||[],r=H?j(t):t;n.splice(n.indexOf(t),1),b?d.$setViewValue(angular.isArray(d.$modelValue)?d.$modelValue.concat(r):[r]):(d.$setViewValue(r),F()),l.groupsIsEmpty(e.groups)&&(e.groups={}),b||st.closeList||Z({query:!0}),f(),e.oldQuery=e.oldQuery||e.query,e.query="",e.backspaceFocus=!1}},e.removeItem=function(n){c.disabled||b&&0>n||(w=b?d.$modelValue[n]:d.$modelValue,t.when(ft(e.$parent,{$item:w})).then(function(){(b||e.inputHide)&&(b?(d.$modelValue.splice(n,1),d.$setViewValue([].concat(d.$modelValue))):(I(),st.cleanModel&&d.$setViewValue(void 0)),(b||!e.backspaceFocus)&&(e.query=dt(w,$,B,at)||""),b&&st.closeList&&Z({query:!0}))}))},e.setSelection=function(t){m||e.selectorPosition===t?m=!1:et(rt,t)},e.keyUp=function(t){switch(t.keyCode){case 8:e.query.length||b&&e.output.length||Z()}},e.keyDown=function(t){var n=0,r=e.order.length-1;switch(t.keyCode){case 38:e.selectorPosition=angular.isNumber(e.selectorPosition)?e.selectorPosition:n,et(rt,e.selectorPosition===n?r:e.selectorPosition-1),m=!0;break;case 40:e.selectorPosition=angular.isNumber(e.selectorPosition)?e.selectorPosition:n-1,et(rt,e.selectorPosition===r?n:e.selectorPosition+1),m=!0,e.query.length||e.isOpen||J(),e.inputHide&&I();break;case 37:case 39:break;case 9:L("tab");break;case 13:L("enter"),t.preventDefault();break;case 32:L("space");break;case 27:b||(F(),st.cleanModel&&d.$setViewValue(w)),Z();break;case 8:if(!e.query.length){if((!b||lt)&&(e.backspaceFocus=!0),e.backspaceFocus&&e.output&&(!b||e.output.length)){e.removeItem(e.output.length-1),lt&&t.preventDefault();break}e.backspaceFocus=!e.backspaceFocus;break}default:return e.inputHide&&I(),e.backspaceFocus=!1,!1}},e.getSearchLabel=function(t){var n=B(t);return pt(n,e.oldQuery||e.query,t,gt(e.$parent))},e.getDropdownLabel=function(t){var n=B(t);return mt(n,e.oldQuery||e.query,t,ht(e.$parent))},e.getDisableWhen=W,Z(),o[0].addEventListener("click",V,!0),o.on("focus",E),o.on("blur",q)}}}}]),angular.module("oi.select").filter("oiSelectCloseIcon",["$sce",function(e){return function(t){var n='<span class="close select-search-list-item_selection-remove">×</span>';return e.trustAsHtml(t+n)}}]).filter("oiSelectHighlight",["$sce","oiSelectEscape",function(e,t){return function(n,r){var o;return r.length>0||angular.isNumber(r)?(n=n.toString(),r=t(r.toString()),o=n.replace(new RegExp(r,"gi"),"<strong>$&</strong>")):o=n,e.trustAsHtml(o)}}]).filter("oiSelectAscSort",["oiSelectEscape",function(e){function t(t,n,r,o){var i,u,s,l,a=[],c=[],d=[];if(n){for(n=e(String(n)),i=0,s=!1;i<t.length;i++){if(s=r(t[i]).match(new RegExp(n,"i")),!s&&o)for(u=0;u<o.length&&!s;u++)s=String(t[i][o[u]]).match(new RegExp(n,"i"));s&&a.push(t[i])}for(i=0;i<a.length;i++)r(a[i]).match(new RegExp("^"+n,"i"))?c.push(a[i]):d.push(a[i]);l=c.concat(d)}else l=[].concat(t);return l}return t}]).filter("none",function(){return function(e){return e}});
\ No newline at end of file
+angular.module("oi.select",[]),angular.module("oi.select").provider("oiSelect",function(){return{options:{debounce:500,searchFilter:"oiSelectCloseIcon",dropdownFilter:"oiSelectHighlight",listFilter:"oiSelectAscSort",groupFilter:"oiSelectGroup",editItem:!1,newItem:!1,closeList:!0,saveTrigger:"enter tab blur"},version:{full:"0.2.19",major:0,minor:2,dot:19},$get:function(){return{options:this.options,version:this.version}}}}).factory("oiSelectEscape",function(){var e=/[-\/\\^$*+?.()|[\]{}]/g,t="\\$&";return function(n){return String(n).replace(e,t)}}).factory("oiSelectEditItem",function(){return function(e,t,n,r){return r?"":n(e)}}).factory("oiUtils",["$document","$timeout",function(e,t){function n(e,t,n){for(var r=t;r&&r.ownerDocument&&11!==r.nodeType;){if(n){if(r===e)return!1;if(r.className.indexOf(n)>=0)return!0}else if(r===e)return!0;r=r.parentNode}return!1}function r(r,o){function i(e){return e&&"INPUT"!==e.target.nodeName?void 0:(d=!1,c?void(d=!0):void t(function(){r.triggerHandler("blur")}))}function u(){a||(a=!0,t(function(){r.triggerHandler("focus")}))}function s(){c=!0}function l(e){c=!1;var u=e.target,s=n(r[0],u);d&&!s&&i(),s&&"INPUT"!==u.nodeName&&t(function(){o[0].focus()}),!s&&a&&(a=!1)}var a,c,d;return e[0].addEventListener("click",l,!0),r[0].addEventListener("mousedown",s,!0),r[0].addEventListener("blur",i,!0),o.on("focus",u),function(){e[0].removeEventListener("click",l),r[0].removeEventListener("mousedown",s,!0),r[0].removeEventListener("blur",i,!0),o.off("focus",u)}}function o(e,t){var n,r,o,i,s,a;t&&(r=e.offsetHeight,o=l(t,"height","margin"),i=e.scrollTop||0,n=u(t).top-u(e).top+i,s=n,a=n-r+o,n+o>r+i?e.scrollTop=a:i>n&&(e.scrollTop=s))}function i(e,t,n,r,o){function i(e){return parseFloat(o[e])}for(var u=n===(r?"border":"content")?4:"width"===t?1:0,s=0,l=["Top","Right","Bottom","Left"];4>u;u+=2)"margin"===n&&(s+=i(n+l[u])),r?("content"===n&&(s-=i("padding"+l[u])),"margin"!==n&&(s-=i("border"+l[u]+"Width"))):(s+=i("padding"+l[u]),"padding"!==n&&(s+=i("border"+l[u]+"Width")));return s}function u(e){var t,n,r=e.getBoundingClientRect(),o=e&&e.ownerDocument;if(o)return t=o.documentElement,n=s(o),{top:r.top+n.pageYOffset-t.clientTop,left:r.left+n.pageXOffset-t.clientLeft}}function s(e){return null!=e&&e===e.window?e:9===e.nodeType&&e.defaultView}function l(e,t,n){var r=!0,o="width"===t?e.offsetWidth:e.offsetHeight,u=window.getComputedStyle(e,null),s=!1;if(0>=o||null==o){if(o=u[t],(0>o||null==o)&&(o=e.style[t]),g.test(o))return o;o=parseFloat(o)||0}return o+i(e,t,n||(s?"border":"content"),r,u)}function a(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t].length)return!1;return!0}function c(e){var t=[];return angular.forEach(e,function(e,n){"$"!==n.toString().charAt(0)&&t.push(e)}),t}function d(e,t,n,r,o){var i,u,s,l,a,c=o?[].concat(e):[];for(i=0,s=e.length;i<e.length;i++)for(l=n?n(e[i]):e[i],u=0;u<t.length;u++)if(a=r?r(t[u]):t[u],angular.equals(l,a,e,t,i,u)){o?c.splice(i+c.length-s,1):c.push(t[u]);break}return c}function f(e,t,n,r){var o={};return e.split(".").reduce(function(e,n,r,o){return e[n]=r<o.length-1?{}:t},o),r(n,o)}var p=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,g=new RegExp("^("+p+")(?!px)[a-z%]+$","i");return{contains:n,bindFocusBlur:r,scrollActiveOption:o,groupsIsEmpty:a,objToArr:c,getValue:f,intersection:d}}]),angular.module("oi.select").directive("oiSelect",["$document","$q","$timeout","$parse","$interpolate","$injector","$filter","$animate","oiUtils","oiSelect",function(e,t,n,r,o,i,u,s,l,a){var c=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,d=/([^\(\)\s\|\s]*)\s*(\(.*\))?\s*(\|?\s*.+)?/;return{restrict:"AE",templateUrl:"src/template.html",require:"ngModel",scope:{},compile:function(e,f){var p=f.oiOptions,g=p?p.match(c):["","i","","","","i","","",""];if(!g)throw new Error("Expected expression in form of '_select_ (as _label_)? for (_key_,)?_value_ in _collection_'");var m,h,v,$,w,b,y,S,F=/ as /.test(g[0])&&g[1],I=g[2]||g[1],k=g[5]||g[7],V=g[3]||"",E=g[4]||"",q=g[9]||I,L=g[8].match(d),P=L[1],C=P+(L[3]||""),x=P+(L[2]||""),A=F&&r(F),H=r(I),O=r(V),T=r(E),N=r(C),D=r(x),_=r(q),M=o(f.multiplePlaceholder||""),Q=o(f.placeholder||""),R=r(f.oiSelectOptions),U=angular.version.major<=1&&angular.version.minor<=3;return function(e,o,c,d){function f(){at&&o.removeClass("cleanMode"),at=!1}function p(e,t){t=t||150,o.addClass(e),n(function(){o.removeClass(e)},t)}function F(){e.listItemHide=!0,e.inputHide=!1}function I(){var t=Y(d.$modelValue);e.listItemHide=!t,e.inputHide=t}function V(t){l.contains(o[0],t.target,"disabled")||e.output.length>=y&&l.contains(o[0],t.target,"select-dropdown")||(e.inputHide&&e.removeItem(0),!e.isOpen||!st.closeList||"INPUT"===t.target.nodeName&&e.query.length?J(e.query):(Z({query:st.editItem&&!at}),e.$evalAsync()))}function E(){e.isFocused||(e.isFocused=!0,c.disabled||(e.backspaceFocus=!1))}function q(){e.isFocused=!1,b||I(),L("blur")||Z(),e.$evalAsync()}function L(r,o){o||(o=r,r=e.query);var i,u=st.saveTrigger.split(" ").indexOf(o)+1,s=st.newItem&&r,l="blur"!==o?e.order[e.selectorPosition]:null;return u&&(s||l)?(e.showLoader=!0,i=t.when(l||S(e.$parent,{$query:r})),i.then(function(r){if(void 0===r)return t.reject();e.addItem(r);var o=e.order.length-1;e.selectorPosition===o&&et(rt,0),st.newItemFn&&!l||n(angular.noop),Z()}).catch(function(){p("invalid-item"),e.showLoader=!1}),!0):void 0}function C(){var e=b&&Y(d.$modelValue)?it:ot;nt.attr("placeholder",e)}function x(t){return l.getValue(k,t,e.$parent,_)}function j(t){return l.getValue(k,t,e.$parent,A)}function B(t){return l.getValue(k,t,e.$parent,H)}function W(t){return l.getValue(k,t,e.$parent,T)}function G(t){return l.getValue(k,t,e.$parent,O)||""}function z(t){return l.getValue(P,t,e.$parent,N)}function X(e){return e=e instanceof Array?e:e?[e]:[],e.filter(function(e){return e&&(e instanceof Array&&e.length||A||B(e))})}function Y(e){return!!X(e).length}function J(r,i){return v&&ct&&n.cancel(v),v=n(function(){var u=D(e.$parent,{$query:r,$selectedAs:i})||"";return e.selectorPosition="prompt"===st.newItem?!1:0,r||i||(e.oldQuery=null),(u.$promise&&!u.$resolved||angular.isFunction(u.then))&&(ct=st.debounce),e.showLoader=!0,t.when(u.$promise||u).then(function(t){if(e.groups={},t&&!i){var n=b?e.output:[],u=vt(l.objToArr(t),r,B,$t(e.$parent),o),s=l.intersection(u,n,x,x,!0),a=z(s);e.groups=tt(a)}return K(),t}).finally(function(){e.showLoader=!1,st.closeList&&!st.cleanModel&&n(function(){et(rt,0)})})},ct)}function K(){var t,n,r,o=[],i=0;e.order=[],e.groupPos={};for(n in e.groups)e.groups.hasOwnProperty(n)&&"$"!=n.charAt(0)&&o.push(n);for(U&&o.sort(),t=0;t<o.length;t++)n=o[t],r=e.groups[n],e.order=e.order.concat(r),e.groupPos[n]=i,i+=r.length}function Z(t){t=t||{},e.oldQuery=null,e.backspaceFocus=!1,e.groups={},e.order=[],e.showLoader=!1,e.isOpen=!1,ct=0,t.query||(e.query=""),v&&n.cancel(v)}function et(t,n){e.selectorPosition=n,l.scrollActiveOption(t[0],t.find("li")[n])}function tt(e){for(var t,n,r={"":[]},o=0;o<e.length;o++)t=G(e[o]),(n=r[t])||(n=r[t]=[]),n.push(e[o]);return r}d.$isEmpty=function(e){return!Y(e)};var nt=o.find("input"),rt=angular.element(o[0].querySelector(".select-dropdown")),ot=Q(e),it=M(e),ut=R(e.$parent)||{},st=angular.extend({cleanModel:"prompt"===ut.newItem},a.options,ut),lt=st.editItem,at="correct"===lt,ct=0;(lt===!0||"correct"===lt)&&(lt="oiSelectEditItem");var dt=lt?i.get(lt):angular.noop,ft=r(st.removeItemFn);g=st.searchFilter.split(":");var pt=u(g[0]),gt=r(g[1]);g=st.dropdownFilter.split(":");var mt=u(g[0]),ht=r(g[1]);g=st.listFilter.split(":");var vt=u(g[0]),$t=r(g[1]);g=st.groupFilter.split(":");var wt=u(g[0]),bt=r(g[1]);S=st.newItemFn?r(st.newItemFn):function(e,t){return(R(t)||{}).newItemModel||t.$query},!st.cleanModel||lt&&!at||o.addClass("cleanMode");var yt=l.bindFocusBlur(o,nt);angular.isDefined(c.autofocus)&&n(function(){nt[0].focus()}),angular.isDefined(c.readonly)&&nt.attr("readonly",!0),angular.isDefined(c.tabindex)&&(nt.attr("tabindex",c.tabindex),o[0].removeAttribute("tabindex")),st.maxlength&&nt.attr("maxlength",st.maxlength),c.$observe("disabled",function(t){nt.prop("disabled",t),b&&d.$modelValue&&d.$modelValue.length&&(e.inputHide=t)}),e.$on("$destroy",yt),e.$parent.$watch(c.multipleLimit,function(e){y=Number(e)||1/0}),e.$parent.$watch(c.multiple,function(e){b=void 0===e?angular.isDefined(c.multiple):e,o[b?"addClass":"removeClass"]("multiple")}),e.$parent.$watch(c.ngModel,function(n,r){var o=X(n),i=t.when(o);C(),Y(r)&&n!==r&&f(),b||I(),A&&Y(n)&&(i=J(null,n).then(function(e){return l.intersection(o,e,null,j)}),v=null),b&&c.disabled&&!Y(n)&&(e.inputHide=!1),i.then(function(t){e.output=t,t.length!==o.length&&e.removeItem(t.length)})}),e.$watch("query",function(t,n){L(t.slice(0,-1),t.slice(-1))||(t===n||e.oldQuery&&!t||h||(rt[0].scrollTop=0,t?(J(t),e.oldQuery=null):b&&(Z(),h=!0)),h=!1)}),e.$watch("groups",function(t){l.groupsIsEmpty(t)?e.isOpen=!1:e.isOpen||c.disabled||(e.isOpen=!0,e.isFocused=!0)}),e.$watch("isFocused",function(e){s[e?"addClass":"removeClass"](o,"focused",!U&&{tempClasses:"focused-animate"})}),e.$watch("isOpen",function(e){s[e?"addClass":"removeClass"](o,"open",!U&&{tempClasses:"open-animate"})}),e.$watch("showLoader",function(e){s[e?"addClass":"removeClass"](o,"loading",!U&&{tempClasses:"loading-animate"})}),e.addItem=function(t){if($=e.query,!b||!l.intersection(e.output,[t],x,x).length){if(e.output.length>=y)return void p("limited");var n=e.groups[G(t)]=e.groups[G(t)]||[],r=A?j(t):t;n.splice(n.indexOf(t),1),b?d.$setViewValue(angular.isArray(d.$modelValue)?d.$modelValue.concat(r):[r]):(d.$setViewValue(r),I()),l.groupsIsEmpty(e.groups)&&(e.groups={}),b||st.closeList||Z({query:!0}),f(),e.oldQuery=e.oldQuery||e.query,e.query="",e.backspaceFocus=!1}},e.removeItem=function(n){c.disabled||b&&0>n||(w=b?d.$modelValue[n]:d.$modelValue,t.when(ft(e.$parent,{$item:w})).then(function(){(b||e.inputHide)&&(b?(d.$modelValue.splice(n,1),d.$setViewValue([].concat(d.$modelValue))):(F(),st.cleanModel&&d.$setViewValue(void 0)),(b||!e.backspaceFocus)&&(e.query=dt(w,$,B,at,o)||""),b&&st.closeList&&Z({query:!0}))}))},e.setSelection=function(t){m||e.selectorPosition===t?m=!1:et(rt,t)},e.keyUp=function(t){switch(t.keyCode){case 8:e.query.length||b&&e.output.length||Z()}},e.keyDown=function(t){var n=0,r=e.order.length-1;switch(t.keyCode){case 38:e.selectorPosition=angular.isNumber(e.selectorPosition)?e.selectorPosition:n,et(rt,e.selectorPosition===n?r:e.selectorPosition-1),m=!0;break;case 40:e.selectorPosition=angular.isNumber(e.selectorPosition)?e.selectorPosition:n-1,et(rt,e.selectorPosition===r?n:e.selectorPosition+1),m=!0,e.query.length||e.isOpen||J(),e.inputHide&&F();break;case 37:case 39:break;case 9:L("tab");break;case 13:L("enter"),t.preventDefault();break;case 32:L("space");break;case 27:b||(I(),st.cleanModel&&d.$setViewValue(w)),Z();break;case 8:if(!e.query.length){if((!b||lt)&&(e.backspaceFocus=!0),e.backspaceFocus&&e.output&&(!b||e.output.length)){e.removeItem(e.output.length-1),lt&&t.preventDefault();break}e.backspaceFocus=!e.backspaceFocus;break}default:return e.inputHide&&F(),e.backspaceFocus=!1,!1}},e.getSearchLabel=function(t){var n=B(t);return pt(n,e.oldQuery||e.query,t,gt(e.$parent),o)},e.getDropdownLabel=function(t){var n=B(t);return mt(n,e.oldQuery||e.query,t,ht(e.$parent),o)},e.getGroupLabel=function(t,n){return wt(t,e.oldQuery||e.query,n,bt(e.$parent),o)},e.getDisableWhen=W,Z(),o[0].addEventListener("click",V,!0),o.on("focus",E),o.on("blur",q)}}}}]),angular.module("oi.select").filter("oiSelectGroup",["$sce",function(e){return function(t){return e.trustAsHtml(t)}}]).filter("oiSelectCloseIcon",["$sce",function(e){return function(t){var n='<span class="close select-search-list-item_selection-remove">×</span>';return e.trustAsHtml(t+n)}}]).filter("oiSelectHighlight",["$sce","oiSelectEscape",function(e,t){return function(n,r){var o;return r.length>0||angular.isNumber(r)?(n=n.toString(),r=t(r.toString()),o=n.replace(new RegExp(r,"gi"),"<strong>$&</strong>")):o=n,e.trustAsHtml(o)}}]).filter("oiSelectAscSort",["oiSelectEscape",function(e){function t(t,n,r,o){var i,u,s,l,a=[],c=[],d=[];if(n){for(n=e(String(n)),i=0,s=!1;i<t.length;i++){if(s=r(t[i]).match(new RegExp(n,"i")),!s&&o)for(u=0;u<o.length&&!s;u++)s=String(t[i][o[u]]).match(new RegExp(n,"i"));s&&a.push(t[i])}for(i=0;i<a.length;i++)r(a[i]).match(new RegExp("^"+n,"i"))?c.push(a[i]):d.push(a[i]);l=c.concat(d)}else l=[].concat(t);return l}return t}]).filter("none",function(){return function(e){return e}});
\ No newline at end of file
diff --git a/docs/examples/customization/filters.js b/docs/examples/customization/filters.js
index 18d1226..f0a3feb 100644
--- a/docs/examples/customization/filters.js
+++ b/docs/examples/customization/filters.js
@@ -1,6 +1,6 @@
 angular.module('selectDemo')
     .filter('mySearchFilter', ['$sce', function($sce) {
-        return function(label) {
+        return function(label, query, option, element) {
 
             var html = '<i>' + label + '</i>';
 
@@ -9,7 +9,7 @@ angular.module('selectDemo')
     }])
 
     .filter('myDropdownFilter', ['$sce', function($sce) {
-        return function(label, query, option) {
+        return function(label, query, option, element) {
 
             var html = '<kbd>#' + option.id + '</kbd> ' + label;
 
@@ -18,13 +18,30 @@ angular.module('selectDemo')
     }])
 
     .filter('myListFilter', function() {
-        return function (list, query, getLabel) {
+        return function (list, query, getLabel, options, element) {
             return list;
         }
     })
 
     .factory('myEditItem', function() {
-        return function(removedValue, lastQuery, getLabel) {
+        return function(removedValue, lastQuery, getLabel, editItemIsCorrected, element) {
             return removedValue ? getLabel(removedValue) + ' :-)' : '';
         };
+    })
+
+    .filter('myGroupFilter', function($sce) {
+        return function(label, query, items, options, element) {
+
+            element[query ? 'addClass' : 'removeClass']('show');
+
+            function toggle(element){
+                angular.element(element).parent().parent().find('li').toggleClass('show');
+                var iconElement = angular.element(element).find('span');
+                iconElement.html(iconElement.html() === '&plus;' ? '&minus;' : '&plus;');
+            }
+
+            var html = '<div class="group-header" onclick="(' + toggle.toString() + ')(this)"><span class="group-header-plus">&plus;</span> ' + label + '</div>';
+
+            return $sce.trustAsHtml(html);
+        };
     });
\ No newline at end of file
diff --git a/docs/examples/customization/template.html b/docs/examples/customization/template.html
index 6ebf88f..a57f8d1 100644
--- a/docs/examples/customization/template.html
+++ b/docs/examples/customization/template.html
@@ -34,7 +34,7 @@ <h2>Customization</h2>
 </div>
 <div hljs>
 .filter('mySearchFilter', function($sce) {
-    return function(label, query, item, options) {
+    return function(label, query, item, options, element) {
 
         var html = '<i>' + label + '</i>';
 
@@ -44,7 +44,7 @@ <h2>Customization</h2>
 </div>
 <div hljs>
 .filter('myDropdownFilter', function($sce) {
-    return function(label, query, item, options) {
+    return function(label, query, item, options, element) {
 
         var html = '<kbd>#' + item.id + '</kbd> ' + label;
 
@@ -54,14 +54,14 @@ <h2>Customization</h2>
 </div>
 <div hljs>
 .filter('myListFilter', function() {
-    return function (list, query, getLabel, options) {
+    return function (list, query, getLabel, options, element) {
         return list;
     }
 });
 </div>
 <div hljs>
 .factory('myEditItem', function() {
-    return function(removedValue, lastQuery, getLabel) {
+    return function(removedValue, lastQuery, getLabel, isCorrected, element) {
         return removedValue ? getLabel(removedValue) + ' :-)' : '';
     };
 })
@@ -71,4 +71,88 @@ <h2>Customization</h2>
 {{bundle}}
 </pre></div>
 </div>
+    <br/>
+
+    <style>
+        oi-select.collapsed-groups .select-dropdown {
+            max-height: none;
+        }
+        oi-select.collapsed-groups .group-header {
+            cursor: pointer;
+        }
+        oi-select.collapsed-groups.show .select-dropdown .group-header-plus,
+        oi-select.collapsed-groups .select-dropdown li:not(.ungroup) {
+            display: none;
+        }
+        oi-select.collapsed-groups.show .select-dropdown li,
+        oi-select.collapsed-groups .select-dropdown li.show {
+            display: block;
+        }
+    </style>
+    <div class="row">
+        <div class="col-md-8">
+            <oi-select
+                    class="collapsed-groups"
+                    oi-options="item.name group by item.category for item in shopArr"
+                    oi-select-options="{
+                        closeList: false,
+                        groupFilter: 'myGroupFilter'
+                    }"
+                    ng-model="bundle2"
+                    placeholder="Select"
+            ></oi-select>
+        </div>
+    </div>
+
+<div class="row">
+
+<div class="col-md-8">
+<div hljs>
+oi-options="item.name group by item.category for item in shopArr"
+ng-model="bundle2"
+oi-select-options="{
+    closeList: false,
+    groupFilter: 'myGroupFilter'
+}"
+</div>
+<div hljs>
+.filter('myGroupFilter', function($sce) {
+    return function(label, query, items, options, element) {
+
+        element[query ? 'addClass' : 'removeClass']('show');
+
+        function toggle(element){
+            angular.element(element).parent().parent().find('li').toggleClass('show');
+            var iconElement = angular.element(element).find('span');
+            iconElement.html(iconElement.html() === '&plus;' ? '&minus;' : '&plus;');
+        }
+
+        var html = '<div class="group-header" onclick="(' + toggle.toString() + ')(this)"><span class="group-header-plus">&plus;</span> ' + label + '</div>';
+
+        return $sce.trustAsHtml(html);
+    };
+});
+</div>
+<div hljs>
+oi-select .select-dropdown {
+    max-height: none;
+}
+oi-select .group-header {
+    cursor: pointer;
+}
+oi-select.show .select-dropdown .group-header-plus,
+oi-select .select-dropdown li:not(.ungroup) {
+    display: none;
+}
+oi-select.show .select-dropdown li,
+oi-select .select-dropdown li.show {
+    display: block;
+}
+</div>
+</div>
+<div class="col-md-4"><pre>
+{{bundle2}}
+</pre></div>
+
 </div>
+</div>
\ No newline at end of file
diff --git a/docs/examples/validation/template.html b/docs/examples/validation/template.html
index e7545d2..d49c1da 100644
--- a/docs/examples/validation/template.html
+++ b/docs/examples/validation/template.html
@@ -29,7 +29,7 @@ <h2>Validation</h2>
 
     <br/>
 
-    <p>Also you can validate new items if return <code>undefined</code> or <code>rejected promise</code> from <code>newItemFn</code></p>
+    <p>You can validate new items if return <code>undefined</code> or <code>rejected promise</code> from <code>newItemFn</code></p>
     <div class="row">
         <div class="col-md-8">
             <oi-select
@@ -75,5 +75,34 @@ <h2>Validation</h2>
 </pre></div>
 </div>
 
+<br/>
+
+<p>Also you can set maximum number of characters allowed in the input</p>
+<div class="row">
+    <div class="col-md-8">
+        <oi-select
+                oi-options="item.name for item in shopArr"
+                ng-model="bundle3"
+                oi-select-options="{
+                    maxlength: 3
+                }"
+                placeholder="Select"
+        ></oi-select>
+    </div>
+</div>
+
+<div class="row">
+<div hljs class="col-md-8">
+oi-options="item.name for item in shopArr"
+ng-model="bundle3"
+oi-select-options="{
+    maxlength: 3
+}"
+</div>
+<div class="col-md-4"><pre>
+{{bundle3}}
+</pre></div>
+</div>
+
 </div>
 </form>
\ No newline at end of file
diff --git a/package.json b/package.json
index c2246cb..f2ff635 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name":    "oi.select",
     "license": "MIT",
-    "version": "0.2.18",
+    "version": "0.2.19",
     "repository": {
         "type": "git",
         "url": "git://github.com/tamtakoe/oi.select.git"
diff --git a/src/directives.js b/src/directives.js
index 8d3dde3..a410eb2 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -83,6 +83,10 @@ angular.module('oi.select')
                 var listFilter = $filter(match[0]),
                     listFilterOptionsFn = $parse(match[1]);
 
+                match = options.groupFilter.split(':');
+                var groupFilter = $filter(match[0]),
+                    groupFilterOptionsFn = $parse(match[1]);
+
                 if (options.newItemFn) {
                     newItemFn = $parse(options.newItemFn);
 
@@ -113,6 +117,10 @@ angular.module('oi.select')
                     element[0].removeAttribute('tabindex');
                 }
 
+                if (options.maxlength) {
+                    inputElement.attr('maxlength', options.maxlength);
+                }
+
                 attrs.$observe('disabled', function(value) {
                     inputElement.prop('disabled', value);
 
@@ -287,7 +295,7 @@ angular.module('oi.select')
                             }
 
                             if (multiple || !scope.backspaceFocus) {
-                                scope.query = editItemFn(removedItem, lastQuery, getLabel, editItemIsCorrected) || '';
+                                scope.query = editItemFn(removedItem, lastQuery, getLabel, editItemIsCorrected, element) || '';
                             }
 
                             if (multiple && options.closeList) {
@@ -393,13 +401,17 @@ angular.module('oi.select')
                 scope.getSearchLabel = function(item) {
                     var label = getLabel(item);
 
-                    return searchFilter(label, scope.oldQuery || scope.query, item, searchFilterOptionsFn(scope.$parent));
+                    return searchFilter(label, scope.oldQuery || scope.query, item, searchFilterOptionsFn(scope.$parent), element);
                 };
 
                 scope.getDropdownLabel = function(item) {
                     var label = getLabel(item);
 
-                    return dropdownFilter(label, scope.oldQuery || scope.query, item, dropdownFilterOptionsFn(scope.$parent));
+                    return dropdownFilter(label, scope.oldQuery || scope.query, item, dropdownFilterOptionsFn(scope.$parent), element);
+                };
+
+                scope.getGroupLabel = function(group, items) {
+                    return groupFilter(group, scope.oldQuery || scope.query, items, groupFilterOptionsFn(scope.$parent), element);
                 };
 
                 scope.getDisableWhen = getDisableWhen;
@@ -582,7 +594,7 @@ angular.module('oi.select')
 
                                 if (values && !selectedAs) {
                                     var outputValues = multiple ? scope.output : [];
-                                    var filteredList = listFilter(oiUtils.objToArr(values), query, getLabel, listFilterOptionsFn(scope.$parent));
+                                    var filteredList = listFilter(oiUtils.objToArr(values), query, getLabel, listFilterOptionsFn(scope.$parent), element);
                                     var withoutIntersection = oiUtils.intersection(filteredList, outputValues, trackBy, trackBy, true);
                                     var filteredOutput = filter(withoutIntersection);
 
diff --git a/src/filters.js b/src/filters.js
index 90b77fe..703bab2 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -1,5 +1,11 @@
 angular.module('oi.select')
 
+.filter('oiSelectGroup', ['$sce', function($sce) {
+    return function(label) {
+        return $sce.trustAsHtml(label);
+    };
+}])
+
 .filter('oiSelectCloseIcon', ['$sce', function($sce) {
     return function(label) {
         var closeIcon = '<span class="close select-search-list-item_selection-remove">×</span>';
diff --git a/src/services.js b/src/services.js
index 7b67e4f..ecd9461 100644
--- a/src/services.js
+++ b/src/services.js
@@ -7,16 +7,17 @@ angular.module('oi.select')
             searchFilter:   'oiSelectCloseIcon',
             dropdownFilter: 'oiSelectHighlight',
             listFilter:     'oiSelectAscSort',
+            groupFilter:    'oiSelectGroup',
             editItem:       false,
             newItem:        false,
             closeList:      true,
             saveTrigger:    'enter tab blur'
         },
         version: {
-            full: '0.2.18',
+            full: '0.2.19',
             major: 0,
             minor: 2,
-            dot: 18
+            dot: 19
         },
         $get: function() {
             return {
diff --git a/src/template.html b/src/template.html
index ec85658..86f85d5 100644
--- a/src/template.html
+++ b/src/template.html
@@ -19,11 +19,11 @@
     <ul ng-if="isOpen" class="select-dropdown-optgroup" ng-repeat="(group, options) in groups">
         <div class="select-dropdown-optgroup-header"
              ng-if="group && options.length"
-             ng-bind="group"></div>
+             ng-bind-html="getGroupLabel(group, options)"></div>
         <li class="select-dropdown-optgroup-option"
             ng-init="isDisabled = getDisableWhen(option)"
             ng-repeat="option in options"
-            ng-class="{'active': selectorPosition === groupPos[group] + $index, 'disabled': isDisabled}"
+            ng-class="{'active': selectorPosition === groupPos[group] + $index, 'disabled': isDisabled, 'ungroup': !group}"
             ng-click="isDisabled || addItem(option)"
             ng-mouseenter="setSelection(groupPos[group] + $index)"
             ng-bind-html="getDropdownLabel(option)"></li>