diff --git a/dist/css/react-widgets.css b/dist/css/react-widgets.css
index a35cbd8c7..2d6af83cc 100644
--- a/dist/css/react-widgets.css
+++ b/dist/css/react-widgets.css
@@ -1 +1 @@
-.rw-btn,.rw-input{color:inherit;font:inherit;margin:0}button.rw-input{overflow:visible}button.rw-input,select.rw-input{text-transform:none}button.rw-input,html input[type="button"].rw-input,input[type="reset"].rw-input,input[type="submit"].rw-input{-webkit-appearance:button;cursor:pointer}button[disabled].rw-input,html input[disabled].rw-input{cursor:not-allowed}button.rw-input::-moz-focus-inner,input.rw-input::-moz-focus-inner{border:0;padding:0}@font-face{font-family:'RwWidgets';src:url('../fonts/rw-widgets.eot?v=4.1.0');src:url('../fonts/rw-widgets.eot?#iefix&v=4.1.0') format('embedded-opentype'),url('../fonts/rw-widgets.woff?v=4.1.0') format('woff'),url('../fonts/rw-widgets.ttf?v=4.1.0') format('truetype'),url('../fonts/rw-widgets.svg?v=4.1.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.rw-i{display:inline-block;font-family:RwWidgets;font-style:normal;font-weight:normal;line-height:1em;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.rw-i-caret-down:before{content:'\e803'}.rw-i-caret-up:before{content:'\e800'}.rw-i-caret-left:before{content:'\e801'}.rw-i-caret-right:before{content:'\e802'}.rw-i-clock-o:before{content:'\e805'}.rw-i-calendar:before{content:'\e804'}.rw-i-search:before{content:'\e806'}.rw-sr{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.rw-widget,.rw-widget *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.rw-widget:before,.rw-widget *:before,.rw-widget:after,.rw-widget *:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.rw-widget{outline:0;-moz-background-clip:border-box;-webkit-background-clip:border-box;background-clip:border-box}.rw-btn{color:#333;line-height:2.286em;display:inline-block;margin:0;text-align:center;vertical-align:middle;background:none;background-image:none;border:1px solid transparent;padding:0;white-space:nowrap}.rw-rtl{direction:rtl}.rw-input{color:#555;height:2.286em;padding:.429em .857em;background-color:#fff}.rw-input[disabled]{-webkit-box-shadow:none;box-shadow:none;cursor:not-allowed;opacity:1;background-color:#eee;border-color:#ccc}.rw-input[readonly]{cursor:not-allowed}.rw-filter-input{position:relative;width:100%;padding-right:1.9em;border:#ccc 1px solid;border-radius:4px;margin-bottom:2px}.rw-rtl .rw-filter-input{padding-left:1.9em;padding-right:0}.rw-filter-input>.rw-input{width:100%;border:none;outline:none}.rw-filter-input>span{margin-top:-2px}.rw-i.rw-loading{background:url("../img/loading.gif") no-repeat center;width:16px;height:100%}.rw-i.rw-loading:before{content:""}.rw-loading-mask{border-radius:4px;position:relative}.rw-loading-mask:after{content:'';background:url("../img/loader-big.gif") no-repeat center;position:absolute;background-color:#fff;opacity:.7;top:0;left:0;height:100%;width:100%}.rw-now{font-weight:600}.rw-state-focus{background-color:#fff;border:#66afe9 1px solid;color:#333}.rw-state-selected{background-color:#adadad;border:#adadad 1px solid;color:#333}.rw-state-disabled{-webkit-box-shadow:none;box-shadow:none;cursor:not-allowed;opacity:1}.rw-btn,.rw-dropdownlist{cursor:pointer}.rw-btn[disabled],.rw-state-disabled .rw-btn,.rw-state-readonly .rw-btn{-webkit-box-shadow:none;box-shadow:none;pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);opacity:.65}ul.rw-list,.rw-selectlist{margin:0;padding-left:0;list-style:none;padding:5px 0;overflow:auto;outline:0;height:100%}ul.rw-list>li,.rw-selectlist>li{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}ul.rw-list>li.rw-list-optgroup,.rw-selectlist>li.rw-list-optgroup{font-weight:bold}ul.rw-list>li.rw-list-option,ul.rw-list>li.rw-list-empty,.rw-selectlist>li.rw-list-option,.rw-selectlist>li.rw-list-empty{padding-left:10px;padding-right:10px}ul.rw-list>li.rw-list-option,.rw-selectlist>li.rw-list-option{cursor:pointer;border:1px solid transparent;border-radius:3px}ul.rw-list>li.rw-list-option:hover,.rw-selectlist>li.rw-list-option:hover{background-color:#e6e6e6;border-color:#adadad}ul.rw-list>li.rw-list-option.rw-state-focus,.rw-selectlist>li.rw-list-option.rw-state-focus{background-color:#fff;border:#66afe9 1px solid;color:#333}ul.rw-list>li.rw-list-option.rw-state-selected,.rw-selectlist>li.rw-list-option.rw-state-selected{background-color:#adadad;border:#adadad 1px solid;color:#333}ul.rw-list>li.rw-list-option.rw-state-disabled,ul.rw-list>li.rw-list-option.rw-state-readonly,.rw-selectlist>li.rw-list-option.rw-state-disabled,.rw-selectlist>li.rw-list-option.rw-state-readonly{color:#777;cursor:not-allowed}ul.rw-list>li.rw-list-option.rw-state-disabled:hover,ul.rw-list>li.rw-list-option.rw-state-readonly:hover,.rw-selectlist>li.rw-list-option.rw-state-disabled:hover,.rw-selectlist>li.rw-list-option.rw-state-readonly:hover{background:none;border-color:transparent}ul.rw-list.rw-list-grouped>li.rw-list-optgroup,.rw-selectlist.rw-list-grouped>li.rw-list-optgroup{padding-left:10px}ul.rw-list.rw-list-grouped>li.rw-list-option,.rw-selectlist.rw-list-grouped>li.rw-list-option{padding-left:20px}.rw-widget{position:relative}.rw-open.rw-widget,.rw-open>.rw-multiselect-wrapper{border-bottom-right-radius:0;border-bottom-left-radius:0}.rw-open-up.rw-widget,.rw-open-up>.rw-multiselect-wrapper{border-top-right-radius:0;border-top-left-radius:0}.rw-combobox .rw-list,.rw-datetimepicker .rw-list,.rw-numberpicker .rw-list,.rw-dropdownlist .rw-list,.rw-multiselect .rw-list{max-height:200px;height:auto}.rw-widget{background-color:#fff;border:#ccc 1px solid;border-radius:4px}.rw-widget .rw-input{border-bottom-left-radius:4px;border-top-left-radius:4px}.rw-rtl .rw-widget .rw-input{border-bottom-left-radius:0;border-top-left-radius:0;border-bottom-right-radius:4px;border-top-right-radius:4px}.rw-widget>.rw-select{border-left:#ccc 1px solid}.rw-widget.rw-rtl>.rw-select{border-right:#ccc 1px solid;border-left:none}.rw-widget.rw-state-focus,.rw-widget.rw-state-focus:hover{-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);border-color:#66afe9;outline:0}.rw-widget.rw-state-readonly,.rw-widget.rw-state-readonly>.rw-multiselect-wrapper{cursor:not-allowed}.rw-widget.rw-state-disabled,.rw-widget.rw-state-disabled:hover,.rw-widget.rw-state-disabled:active{-webkit-box-shadow:none;box-shadow:none;background-color:#eee;border-color:#ccc}.rw-combobox,.rw-datetimepicker,.rw-numberpicker,.rw-dropdownlist{padding-right:1.9em}.rw-combobox.rw-rtl,.rw-datetimepicker.rw-rtl,.rw-numberpicker.rw-rtl,.rw-dropdownlist.rw-rtl{padding-right:0;padding-left:1.9em}.rw-combobox>.rw-input,.rw-datetimepicker>.rw-input,.rw-numberpicker>.rw-input,.rw-dropdownlist>.rw-input{width:100%;border:none;outline:0}.rw-combobox>.rw-input::-moz-placeholder,.rw-datetimepicker>.rw-input::-moz-placeholder,.rw-numberpicker>.rw-input::-moz-placeholder,.rw-dropdownlist>.rw-input::-moz-placeholder{color:#999;opacity:1}.rw-combobox>.rw-input:-ms-input-placeholder,.rw-datetimepicker>.rw-input:-ms-input-placeholder,.rw-numberpicker>.rw-input:-ms-input-placeholder,.rw-dropdownlist>.rw-input:-ms-input-placeholder{color:#999}.rw-combobox>.rw-input::-webkit-input-placeholder,.rw-datetimepicker>.rw-input::-webkit-input-placeholder,.rw-numberpicker>.rw-input::-webkit-input-placeholder,.rw-dropdownlist>.rw-input::-webkit-input-placeholder{color:#999}.rw-placeholder{color:#999}.rw-select{position:absolute;width:1.9em;height:100%;right:0;top:0}.rw-select.rw-btn,.rw-select>.rw-btn{height:100%;vertical-align:middle;outline:0}.rw-rtl .rw-select{left:0;right:auto}.rw-multiselect,.rw-combobox input.rw-input,.rw-datetimepicker input.rw-input,.rw-numberpicker input.rw-input{-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.rw-combobox:active,.rw-datetimepicker:active,.rw-dropdownlist:active,.rw-header>.rw-btn:active,.rw-numberpicker .rw-btn.rw-state-active,.rw-combobox:active.rw-state-focus,.rw-datetimepicker:active.rw-state-focus,.rw-dropdownlist:active.rw-state-focus,.rw-header>.rw-btn:active.rw-state-focus,.rw-numberpicker .rw-btn.rw-state-active.rw-state-focus{background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.rw-combobox:hover,.rw-datetimepicker:hover,.rw-numberpicker:hover,.rw-dropdownlist:hover{background-color:#e6e6e6;border-color:#adadad}.rw-dropdownlist.rw-state-disabled,.rw-dropdownlist.rw-state-readonly{cursor:not-allowed}.rw-dropdownlist>.rw-input{line-height:2.286em;background-color:transparent;padding-top:0;padding-bottom:0;padding-right:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.rw-dropdownlist.rw-rtl>.rw-input{padding:.429em .857em;padding-top:0;padding-bottom:0;padding-left:0}.rw-dropdownlist>.rw-select,.rw-dropdownlist.rw-rtl>.rw-select{border-width:0}.rw-numberpicker .rw-btn{display:block;height:1.143em;line-height:1.143em;width:100%;border-width:0}.rw-popup{position:absolute;-webkit-box-shadow:0 5px 6px rgba(0,0,0,0.2);box-shadow:0 5px 6px rgba(0,0,0,0.2);border-top-right-radius:0;border-top-left-radius:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px;border:#ccc 1px solid;background:#fff;padding:2px;overflow:auto;margin-bottom:10px;left:10px;right:10px}.rw-dropup>.rw-popup{margin-bottom:0;margin-top:10px;border-top-right-radius:3px;border-top-left-radius:3px;border-bottom-right-radius:0;border-bottom-left-radius:0;-webkit-box-shadow:0 0 6px rgba(0,0,0,0.2);box-shadow:0 0 6px rgba(0,0,0,0.2)}.rw-popup-container{position:absolute;top:100%;margin-top:1px;z-index:1005;left:-11px;right:-11px}.rw-widget.rw-state-focus .rw-popup-container{z-index:1015}.rw-popup-container.rw-dropup{top:auto;bottom:100%}.rw-popup-container.rw-calendar-popup{right:auto;width:18em}.rw-datetimepicker .rw-btn{width:1.8em}.rw-datetimepicker.rw-has-neither{padding-left:0;padding-right:0}.rw-datetimepicker.rw-has-neither .rw-input{border-radius:4px}.rw-datetimepicker.rw-has-both{padding-right:3.8em}.rw-datetimepicker.rw-has-both.rw-rtl{padding-right:0;padding-left:3.8em}.rw-datetimepicker.rw-has-both>.rw-select{width:3.8em;height:100%}.rw-calendar{background-color:#fff}.rw-calendar thead>tr{border-bottom:2px solid #ccc}.rw-calendar .rw-header{padding-bottom:5px}.rw-calendar .rw-header .rw-btn-left,.rw-calendar .rw-header .rw-btn-right{width:12.5%}.rw-calendar .rw-header .rw-btn-view{width:75%;background-color:#eee;border-radius:4px}.rw-calendar .rw-header .rw-btn-view[disabled]{-webkit-box-shadow:none;box-shadow:none;cursor:not-allowed}.rw-calendar .rw-footer{border-top:1px solid #ccc}.rw-calendar .rw-footer .rw-btn{width:100%;white-space:normal}.rw-calendar .rw-footer .rw-btn:hover{background-color:#e6e6e6}.rw-calendar .rw-footer .rw-btn[disabled]{-webkit-box-shadow:none;box-shadow:none;cursor:not-allowed}.rw-calendar-grid{outline:none;height:14.28571429em;table-layout:fixed;width:100%}.rw-calendar-grid th{text-align:right;padding:0 .4em 0 .1em}.rw-calendar-grid .rw-btn{width:100%;text-align:right}.rw-calendar-grid td .rw-btn{border-radius:4px;padding:0 .4em 0 .1em;outline:0}.rw-calendar-grid td .rw-btn:hover{background-color:#e6e6e6}.rw-calendar-grid td .rw-btn.rw-off-range{color:#b3b3b3}.rw-calendar-grid.rw-nav-view .rw-btn{padding:.25em 0 .3em;display:block;overflow:hidden;text-align:center;white-space:normal}.rw-selectlist{padding:2px}.rw-selectlist>ul{height:100%;overflow:auto}.rw-selectlist>ul>li.rw-list-option{position:relative;min-height:27px;cursor:auto;outline:none;padding-left:5px}.rw-selectlist>ul>li.rw-list-option>label>input{position:absolute;margin:4px 0 0 -20px}.rw-selectlist>ul>li.rw-list-option>label{padding-left:20px;line-height:1.423em;display:inline-block}.rw-selectlist.rw-rtl>ul>li.rw-list-option{padding-left:0;padding-right:5px}.rw-selectlist.rw-rtl>ul>li.rw-list-option>label>input{margin:4px -20px 0 0}.rw-selectlist.rw-rtl>ul>li.rw-list-option>label{padding-left:0;padding-right:20px}.rw-selectlist.rw-rtl>ul>li.rw-list-option{padding-left:0;padding-right:5px}.rw-selectlist.rw-rtl>ul>li.rw-list-option>label>input{margin:4px -20px 0 0}.rw-selectlist.rw-rtl>ul>li.rw-list-option>label{padding-left:0;padding-right:20px}.rw-selectlist.rw-state-disabled>ul>li:hover,.rw-selectlist.rw-state-readonly>ul>li:hover{background:none;border-color:transparent}.rw-multiselect{background-color:#fff}.rw-multiselect:hover{border-color:#adadad}.rw-multiselect-wrapper{border-radius:4px;position:relative;cursor:text}.rw-multiselect-wrapper:before,.rw-multiselect-wrapper:after{content:" ";display:table}.rw-multiselect-wrapper:after{clear:both}.rw-multiselect-wrapper i.rw-loading{position:absolute;right:3px}.rw-multiselect-wrapper>.rw-input{outline:0;border-width:0;line-height:normal;width:auto;max-width:100%}.rw-multiselect-wrapper>.rw-input::-moz-placeholder{color:#999;opacity:1}.rw-multiselect-wrapper>.rw-input:-ms-input-placeholder{color:#999}.rw-multiselect-wrapper>.rw-input::-webkit-input-placeholder{color:#999}.rw-state-readonly>.rw-multiselect-wrapper,.rw-state-disabled>.rw-multiselect-wrapper{cursor:not-allowed}.rw-rtl .rw-multiselect-wrapper>.rw-input{float:right}.rw-multiselect-create-tag{border-top:1px #ccc solid;padding-top:5px;margin-top:5px}.rw-multiselect-taglist{margin:0;padding-left:0;list-style:none;display:inline;padding-right:0}.rw-multiselect-taglist>li{display:inline-block;padding-left:5px;padding-right:5px}.rw-multiselect-taglist>li{display:inline-block;margin:1px;padding:.214em .15em .214em .4em;line-height:1.4em;text-align:center;white-space:nowrap;border-radius:3px;border:1px solid #ccc;background-color:#ccc;cursor:pointer}.rw-multiselect-taglist>li.rw-state-focus{background-color:#fff;border:#66afe9 1px solid;color:#333}.rw-multiselect-taglist>li.rw-state-readonly,.rw-multiselect-taglist>li.rw-state-disabled,.rw-multiselect.rw-state-readonly .rw-multiselect-taglist>li,.rw-multiselect.rw-state-disabled .rw-multiselect-taglist>li{cursor:not-allowed;filter:alpha(opacity=65);opacity:.65}.rw-multiselect-taglist>li .rw-btn{outline:0;font-size:115%;line-height:normal}.rw-rtl .rw-multiselect-taglist>li{float:right}
\ No newline at end of file
+.rw-btn,.rw-input{color:inherit;font:inherit;margin:0}button.rw-input{overflow:visible}button.rw-input,select.rw-input{text-transform:none}button.rw-input,html input[type="button"].rw-input,input[type="reset"].rw-input,input[type="submit"].rw-input{-webkit-appearance:button;cursor:pointer}button[disabled].rw-input,html input[disabled].rw-input{cursor:not-allowed}button.rw-input::-moz-focus-inner,input.rw-input::-moz-focus-inner{border:0;padding:0}@font-face{font-family:'RwWidgets';src:url('../fonts/rw-widgets.eot?v=4.1.0');src:url('../fonts/rw-widgets.eot?#iefix&v=4.1.0') format('embedded-opentype'),url('../fonts/rw-widgets.woff?v=4.1.0') format('woff'),url('../fonts/rw-widgets.ttf?v=4.1.0') format('truetype'),url('../fonts/rw-widgets.svg?v=4.1.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.rw-i{display:inline-block;font-family:RwWidgets;font-style:normal;font-weight:normal;line-height:1em;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.rw-i-caret-down:before{content:'\e803'}.rw-i-caret-up:before{content:'\e800'}.rw-i-caret-left:before{content:'\e801'}.rw-i-caret-right:before{content:'\e802'}.rw-i-clock-o:before{content:'\e805'}.rw-i-calendar:before{content:'\e804'}.rw-i-search:before{content:'\e806'}.rw-sr{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.rw-widget,.rw-widget *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.rw-widget:before,.rw-widget *:before,.rw-widget:after,.rw-widget *:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.rw-widget{outline:0;-moz-background-clip:border-box;-webkit-background-clip:border-box;background-clip:border-box}.rw-btn{color:#333;line-height:2.286em;display:inline-block;margin:0;text-align:center;vertical-align:middle;background:none;background-image:none;border:1px solid transparent;padding:0;white-space:nowrap}.rw-rtl{direction:rtl}.rw-input{color:#555;height:2.286em;padding:.429em .857em;background-color:#fff}.rw-input[disabled]{-webkit-box-shadow:none;box-shadow:none;cursor:not-allowed;opacity:1;background-color:#eee;border-color:#ccc}.rw-input[readonly]{cursor:not-allowed}.rw-filter-input{position:relative;width:100%;padding-right:1.9em;border:#ccc 1px solid;border-radius:4px;margin-bottom:2px}.rw-rtl .rw-filter-input{padding-left:1.9em;padding-right:0}.rw-filter-input>.rw-input{width:100%;border:none;outline:none}.rw-filter-input>span{margin-top:-2px}.rw-i.rw-loading{background:url("../img/loading.gif") no-repeat center;width:16px;height:100%}.rw-i.rw-loading:before{content:""}.rw-loading-mask{border-radius:4px;position:relative}.rw-loading-mask:after{content:'';background:url("../img/loader-big.gif") no-repeat center;position:absolute;background-color:#fff;opacity:.7;top:0;left:0;height:100%;width:100%}.rw-now{font-weight:600}.rw-state-focus{background-color:#fff;border:#66afe9 1px solid;color:#333}.rw-state-selected{background-color:#adadad;border:#adadad 1px solid;color:#333}.rw-state-disabled{-webkit-box-shadow:none;box-shadow:none;cursor:not-allowed;opacity:1}.rw-btn,.rw-dropdownlist{cursor:pointer}.rw-btn[disabled],.rw-state-disabled .rw-btn,.rw-state-readonly .rw-btn{-webkit-box-shadow:none;box-shadow:none;pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);opacity:.65}ul.rw-list,.rw-selectlist{margin:0;padding-left:0;list-style:none;padding:5px 0;overflow:auto;outline:0;height:100%}ul.rw-list>li,.rw-selectlist>li{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}ul.rw-list>li.rw-list-optgroup,.rw-selectlist>li.rw-list-optgroup{font-weight:bold}ul.rw-list>li.rw-list-option,ul.rw-list>li.rw-list-empty,.rw-selectlist>li.rw-list-option,.rw-selectlist>li.rw-list-empty{padding-left:10px;padding-right:10px}ul.rw-list>li.rw-list-option,.rw-selectlist>li.rw-list-option{cursor:pointer;border:1px solid transparent;border-radius:3px}ul.rw-list>li.rw-list-option:hover,.rw-selectlist>li.rw-list-option:hover{background-color:#e6e6e6;border-color:#adadad}ul.rw-list>li.rw-list-option.rw-state-focus,.rw-selectlist>li.rw-list-option.rw-state-focus{background-color:#fff;border:#66afe9 1px solid;color:#333}ul.rw-list>li.rw-list-option.rw-state-selected,.rw-selectlist>li.rw-list-option.rw-state-selected{background-color:#adadad;border:#adadad 1px solid;color:#333}ul.rw-list>li.rw-list-option.rw-state-disabled,ul.rw-list>li.rw-list-option.rw-state-readonly,.rw-selectlist>li.rw-list-option.rw-state-disabled,.rw-selectlist>li.rw-list-option.rw-state-readonly{color:#777;cursor:not-allowed}ul.rw-list>li.rw-list-option.rw-state-disabled:hover,ul.rw-list>li.rw-list-option.rw-state-readonly:hover,.rw-selectlist>li.rw-list-option.rw-state-disabled:hover,.rw-selectlist>li.rw-list-option.rw-state-readonly:hover{background:none;border-color:transparent}ul.rw-list.rw-list-grouped>li.rw-list-optgroup,.rw-selectlist.rw-list-grouped>li.rw-list-optgroup{padding-left:10px}ul.rw-list.rw-list-grouped>li.rw-list-option,.rw-selectlist.rw-list-grouped>li.rw-list-option{padding-left:20px}.rw-widget{position:relative}.rw-open.rw-widget,.rw-open>.rw-multiselect-wrapper{border-bottom-right-radius:0;border-bottom-left-radius:0}.rw-open-up.rw-widget,.rw-open-up>.rw-multiselect-wrapper{border-top-right-radius:0;border-top-left-radius:0}.rw-combobox .rw-list,.rw-datetimepicker .rw-list,.rw-numberpicker .rw-list,.rw-dropdownlist .rw-list,.rw-multiselect .rw-list{max-height:200px;height:auto}.rw-widget{background-color:#fff;border:#ccc 1px solid;border-radius:4px}.rw-widget .rw-input{border-bottom-left-radius:4px;border-top-left-radius:4px}.rw-rtl .rw-widget .rw-input{border-bottom-left-radius:0;border-top-left-radius:0;border-bottom-right-radius:4px;border-top-right-radius:4px}.rw-widget>.rw-select{border-left:#ccc 1px solid}.rw-widget.rw-rtl>.rw-select{border-right:#ccc 1px solid;border-left:none}.rw-widget.rw-state-focus,.rw-widget.rw-state-focus:hover{-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);border-color:#66afe9;outline:0}.rw-widget.rw-state-readonly,.rw-widget.rw-state-readonly>.rw-multiselect-wrapper{cursor:not-allowed}.rw-widget.rw-state-disabled,.rw-widget.rw-state-disabled:hover,.rw-widget.rw-state-disabled:active{-webkit-box-shadow:none;box-shadow:none;background-color:#eee;border-color:#ccc}.rw-combobox,.rw-datetimepicker,.rw-numberpicker,.rw-dropdownlist{padding-right:1.9em}.rw-combobox.rw-rtl,.rw-datetimepicker.rw-rtl,.rw-numberpicker.rw-rtl,.rw-dropdownlist.rw-rtl{padding-right:0;padding-left:1.9em}.rw-combobox>.rw-input,.rw-datetimepicker>.rw-input,.rw-numberpicker>.rw-input,.rw-dropdownlist>.rw-input{width:100%;border:none;outline:0}.rw-combobox>.rw-input::-moz-placeholder,.rw-datetimepicker>.rw-input::-moz-placeholder,.rw-numberpicker>.rw-input::-moz-placeholder,.rw-dropdownlist>.rw-input::-moz-placeholder{color:#999;opacity:1}.rw-combobox>.rw-input:-ms-input-placeholder,.rw-datetimepicker>.rw-input:-ms-input-placeholder,.rw-numberpicker>.rw-input:-ms-input-placeholder,.rw-dropdownlist>.rw-input:-ms-input-placeholder{color:#999}.rw-combobox>.rw-input::-webkit-input-placeholder,.rw-datetimepicker>.rw-input::-webkit-input-placeholder,.rw-numberpicker>.rw-input::-webkit-input-placeholder,.rw-dropdownlist>.rw-input::-webkit-input-placeholder{color:#999}.rw-placeholder{color:#999}.rw-select{position:absolute;width:1.9em;height:100%;right:0;top:0}.rw-select.rw-btn,.rw-select>.rw-btn{height:100%;vertical-align:middle;outline:0}.rw-rtl .rw-select{left:0;right:auto}.rw-multiselect,.rw-combobox input.rw-input,.rw-datetimepicker input.rw-input,.rw-numberpicker input.rw-input{-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.rw-combobox:active,.rw-datetimepicker:active,.rw-dropdownlist:active,.rw-header>.rw-btn:active,.rw-numberpicker .rw-btn.rw-state-active,.rw-combobox:active.rw-state-focus,.rw-datetimepicker:active.rw-state-focus,.rw-dropdownlist:active.rw-state-focus,.rw-header>.rw-btn:active.rw-state-focus,.rw-numberpicker .rw-btn.rw-state-active.rw-state-focus{background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.rw-combobox:hover,.rw-datetimepicker:hover,.rw-numberpicker:hover,.rw-dropdownlist:hover{background-color:#e6e6e6;border-color:#adadad}.rw-dropdownlist.rw-state-disabled,.rw-dropdownlist.rw-state-readonly{cursor:not-allowed}.rw-dropdownlist>.rw-input{line-height:2.286em;background-color:transparent;padding-top:0;padding-bottom:0;padding-right:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.rw-dropdownlist.rw-rtl>.rw-input{padding:.429em .857em;padding-top:0;padding-bottom:0;padding-left:0}.rw-dropdownlist>.rw-select,.rw-dropdownlist.rw-rtl>.rw-select{border-width:0}.rw-numberpicker .rw-btn{display:block;height:1.143em;line-height:1.143em;width:100%;border-width:0}.rw-popup{position:absolute;-webkit-box-shadow:0 5px 6px rgba(0,0,0,0.2);box-shadow:0 5px 6px rgba(0,0,0,0.2);border-top-right-radius:0;border-top-left-radius:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px;border:#ccc 1px solid;background:#fff;padding:2px;overflow:auto;margin-bottom:10px;left:10px;right:10px}.rw-dropup>.rw-popup{margin-bottom:0;margin-top:10px;border-top-right-radius:3px;border-top-left-radius:3px;border-bottom-right-radius:0;border-bottom-left-radius:0;-webkit-box-shadow:0 0 6px rgba(0,0,0,0.2);box-shadow:0 0 6px rgba(0,0,0,0.2)}.rw-popup-container{position:absolute;top:100%;margin-top:1px;z-index:1005;left:-11px;right:-11px}.rw-widget.rw-state-focus .rw-popup-container{z-index:1015}.rw-popup-container.rw-dropup{top:auto;bottom:100%}.rw-popup-container.rw-calendar-popup{right:auto;width:18em}.rw-datetimepicker .rw-btn{width:1.8em}.rw-datetimepicker.rw-has-neither{padding-left:0;padding-right:0}.rw-datetimepicker.rw-has-neither .rw-input{border-radius:4px}.rw-datetimepicker.rw-has-both{padding-right:3.8em}.rw-datetimepicker.rw-has-both.rw-rtl{padding-right:0;padding-left:3.8em}.rw-datetimepicker.rw-has-both>.rw-select{width:3.8em;height:100%}.rw-calendar{background-color:#fff}.rw-calendar thead>tr{border-bottom:2px solid #ccc}.rw-calendar .rw-header{padding-bottom:5px}.rw-calendar .rw-header .rw-btn-left,.rw-calendar .rw-header .rw-btn-right{width:12.5%}.rw-calendar .rw-header .rw-btn-view{width:75%;background-color:#eee;border-radius:4px}.rw-calendar .rw-header .rw-btn-view[disabled]{-webkit-box-shadow:none;box-shadow:none;cursor:not-allowed}.rw-calendar .rw-footer{border-top:1px solid #ccc}.rw-calendar .rw-footer .rw-btn{width:100%;white-space:normal}.rw-calendar .rw-footer .rw-btn:hover{background-color:#e6e6e6}.rw-calendar .rw-footer .rw-btn[disabled]{-webkit-box-shadow:none;box-shadow:none;cursor:not-allowed}.rw-calendar-grid{outline:none;height:14.28571429em;table-layout:fixed;width:100%}.rw-calendar-grid th{text-align:right;padding:0 .4em 0 .1em}.rw-calendar-grid .rw-btn{width:100%;text-align:right}.rw-calendar-grid td .rw-btn{border-radius:4px;padding:0 .4em 0 .1em;outline:0}.rw-calendar-grid td .rw-btn:hover{background-color:#e6e6e6}.rw-calendar-grid td .rw-btn.rw-off-range{color:#b3b3b3}.rw-calendar-grid.rw-nav-view .rw-btn{padding:.25em 0 .3em;display:block;overflow:hidden;text-align:center;white-space:normal}.rw-selectlist{padding:2px}.rw-selectlist>ul{height:100%;overflow:auto}.rw-selectlist>ul>li.rw-list-option{position:relative;min-height:27px;cursor:auto;outline:none;padding-left:5px}.rw-selectlist>ul>li.rw-list-option>label>input{position:absolute;margin:4px 0 0 -20px}.rw-selectlist>ul>li.rw-list-option>label{padding-left:20px;line-height:1.423em;display:inline-block}.rw-selectlist.rw-rtl>ul>li.rw-list-option{padding-left:0;padding-right:5px}.rw-selectlist.rw-rtl>ul>li.rw-list-option>label>input{margin:4px -20px 0 0}.rw-selectlist.rw-rtl>ul>li.rw-list-option>label{padding-left:0;padding-right:20px}.rw-selectlist.rw-rtl>ul>li.rw-list-option{padding-left:0;padding-right:5px}.rw-selectlist.rw-rtl>ul>li.rw-list-option>label>input{margin:4px -20px 0 0}.rw-selectlist.rw-rtl>ul>li.rw-list-option>label{padding-left:0;padding-right:20px}.rw-selectlist.rw-state-disabled>ul>li:hover,.rw-selectlist.rw-state-readonly>ul>li:hover{background:none;border-color:transparent}.rw-multiselect{background-color:#fff}.rw-multiselect:hover{border-color:#adadad}.rw-multiselect-wrapper{border-radius:4px;position:relative;cursor:text}.rw-multiselect-wrapper:before,.rw-multiselect-wrapper:after{content:" ";display:table}.rw-multiselect-wrapper:after{clear:both}.rw-multiselect-wrapper i.rw-loading{position:absolute;right:3px}.rw-multiselect-wrapper>.rw-input{outline:0;border-width:0;line-height:normal;width:auto;max-width:100%}.rw-multiselect-wrapper>.rw-input::-moz-placeholder{color:#999;opacity:1}.rw-multiselect-wrapper>.rw-input:-ms-input-placeholder{color:#999}.rw-multiselect-wrapper>.rw-input::-webkit-input-placeholder{color:#999}.rw-state-readonly>.rw-multiselect-wrapper,.rw-state-disabled>.rw-multiselect-wrapper{cursor:not-allowed}.rw-rtl .rw-multiselect-wrapper>.rw-input{float:right}.rw-multiselect-create-tag{border-top:1px #ccc solid;padding-top:5px;margin-top:5px}.rw-multiselect-taglist{margin:0;padding-left:0;list-style:none;display:inline;padding-right:0}.rw-multiselect-taglist>li{display:inline-block;padding-left:5px;padding-right:5px}.rw-multiselect-taglist>li{display:inline-block;margin:1px;padding:.214em .15em .214em .4em;line-height:1.4em;text-align:center;white-space:nowrap;border-radius:3px;border:1px solid #ccc;background-color:#ccc;cursor:pointer}.rw-multiselect-taglist>li.rw-state-focus{background-color:#fff;border:#66afe9 1px solid;color:#333}.rw-multiselect-taglist>li.rw-state-readonly,.rw-multiselect-taglist>li.rw-state-disabled,.rw-multiselect.rw-state-readonly .rw-multiselect-taglist>li,.rw-multiselect.rw-state-disabled .rw-multiselect-taglist>li{cursor:not-allowed;filter:alpha(opacity=65);opacity:.65}.rw-multiselect-taglist>li .rw-btn{outline:0;font-size:115%;line-height:normal}.rw-rtl .rw-multiselect-taglist>li{float:right}
\ No newline at end of file
diff --git a/dist/react-widgets-globalize.js b/dist/react-widgets-globalize.js
index 965fe4942..9b826193a 100644
--- a/dist/react-widgets-globalize.js
+++ b/dist/react-widgets-globalize.js
@@ -1,15 +1,5 @@
 /*! (c) 2016 Jason Quense | https://github.com/jquense/react-widgets/blob/master/License.txt */
-(function webpackUniversalModuleDefinition(root, factory) {
-	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("react"), require("ReactWidgets"));
-	else if(typeof define === 'function' && define.amd)
-		define([, "ReactWidgets"], factory);
-	else if(typeof exports === 'object')
-		exports["ReactWidgets"] = factory(require("react"), require("ReactWidgets"));
-	else
-		root["ReactWidgets"] = factory(root["React"], root["ReactWidgets"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE_20__, __WEBPACK_EXTERNAL_MODULE_91__) {
-return /******/ (function(modules) { // webpackBootstrap
+/******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
 
@@ -51,9 +41,23 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 	return __webpack_require__(0);
 /******/ })
 /************************************************************************/
-/******/ ({
+/******/ ([
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/*** IMPORTS FROM imports-loader ***/
+	var module = __webpack_require__(1);
+	var args = [Globalize];
+
+
+	if (typeof module === 'function') {
+	  module.apply(null, args || [])
+	}
+
 
-/***/ 0:
+
+/***/ },
+/* 1 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -61,9 +65,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.__esModule = true;
 	exports.default = globalizeLocalizers;
 
-	var _react = __webpack_require__(20);
+	var _react = __webpack_require__(2);
 
-	var _configure = __webpack_require__(91);
+	var _configure = __webpack_require__(3);
 
 	var _configure2 = _interopRequireDefault(_configure);
 
@@ -264,21 +268,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ },
-
-/***/ 20:
+/* 2 */
 /***/ function(module, exports) {
 
-	module.exports = __WEBPACK_EXTERNAL_MODULE_20__;
+	module.exports = window.React;
 
 /***/ },
-
-/***/ 91:
+/* 3 */
 /***/ function(module, exports) {
 
-	module.exports = __WEBPACK_EXTERNAL_MODULE_91__;
+	module.exports = window.ReactWidgets;
 
 /***/ }
-
-/******/ })
-});
-;
\ No newline at end of file
+/******/ ]);
\ No newline at end of file
diff --git a/dist/react-widgets-moment.js b/dist/react-widgets-moment.js
index b9746a2c1..8b6d92610 100644
--- a/dist/react-widgets-moment.js
+++ b/dist/react-widgets-moment.js
@@ -1,15 +1,5 @@
 /*! (c) 2016 Jason Quense | https://github.com/jquense/react-widgets/blob/master/License.txt */
-(function webpackUniversalModuleDefinition(root, factory) {
-	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("ReactWidgets"));
-	else if(typeof define === 'function' && define.amd)
-		define(["ReactWidgets"], factory);
-	else if(typeof exports === 'object')
-		exports["ReactWidgets"] = factory(require("ReactWidgets"));
-	else
-		root["ReactWidgets"] = factory(root["ReactWidgets"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE_91__) {
-return /******/ (function(modules) { // webpackBootstrap
+/******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
 
@@ -51,9 +41,23 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 	return __webpack_require__(0);
 /******/ })
 /************************************************************************/
-/******/ ({
+/******/ ([
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/*** IMPORTS FROM imports-loader ***/
+	var module = __webpack_require__(1);
+	var args = [moment];
+
+
+	if (typeof module === 'function') {
+	  module.apply(null, args || [])
+	}
+
 
-/***/ 0:
+
+/***/ },
+/* 1 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -119,7 +123,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return localizer;
 	};
 
-	var _configure = __webpack_require__(91);
+	var _configure = __webpack_require__(2);
 
 	var _configure2 = _interopRequireDefault(_configure);
 
@@ -128,14 +132,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ },
-
-/***/ 91:
+/* 2 */
 /***/ function(module, exports) {
 
-	module.exports = __WEBPACK_EXTERNAL_MODULE_91__;
+	module.exports = window.ReactWidgets;
 
 /***/ }
-
-/******/ })
-});
-;
\ No newline at end of file
+/******/ ]);
\ No newline at end of file
diff --git a/dist/react-widgets-simple-number.js b/dist/react-widgets-simple-number.js
index e49c3a250..c1b17a3dd 100644
--- a/dist/react-widgets-simple-number.js
+++ b/dist/react-widgets-simple-number.js
@@ -1,15 +1,5 @@
 /*! (c) 2016 Jason Quense | https://github.com/jquense/react-widgets/blob/master/License.txt */
-(function webpackUniversalModuleDefinition(root, factory) {
-	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("ReactWidgets"));
-	else if(typeof define === 'function' && define.amd)
-		define(["ReactWidgets"], factory);
-	else if(typeof exports === 'object')
-		exports["ReactWidgets"] = factory(require("ReactWidgets"));
-	else
-		root["ReactWidgets"] = factory(root["ReactWidgets"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE_91__) {
-return /******/ (function(modules) { // webpackBootstrap
+/******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
 
@@ -51,9 +41,23 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 	return __webpack_require__(0);
 /******/ })
 /************************************************************************/
-/******/ ({
+/******/ ([
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/*** IMPORTS FROM imports-loader ***/
+	var module = __webpack_require__(1);
+	var args = [];
+
+
+	if (typeof module === 'function') {
+	  module.apply(null, args || [])
+	}
+
+
 
-/***/ 0:
+/***/ },
+/* 1 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -64,15 +68,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	exports.default = simpleNumber;
 
-	var _configure = __webpack_require__(91);
+	var _configure = __webpack_require__(2);
 
 	var _configure2 = _interopRequireDefault(_configure);
 
-	var _formatNumberWithString = __webpack_require__(92);
+	var _formatNumberWithString = __webpack_require__(3);
 
 	var _formatNumberWithString2 = _interopRequireDefault(_formatNumberWithString);
 
-	var _deconstructNumberFormat = __webpack_require__(93);
+	var _deconstructNumberFormat = __webpack_require__(4);
 
 	var _deconstructNumberFormat2 = _interopRequireDefault(_deconstructNumberFormat);
 
@@ -137,21 +141,19 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 
 /***/ },
-
-/***/ 91:
+/* 2 */
 /***/ function(module, exports) {
 
-	module.exports = __WEBPACK_EXTERNAL_MODULE_91__;
+	module.exports = window.ReactWidgets;
 
 /***/ },
-
-/***/ 92:
+/* 3 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
-	var deconstructNumberFormat = __webpack_require__(93);
-	var formatFactory = __webpack_require__(94);
+	var deconstructNumberFormat = __webpack_require__(4);
+	var formatFactory = __webpack_require__(5);
 
 	exports = module.exports = function formatNumberWithString(value, requiredFormat, overrideOptions) {
 
@@ -187,8 +189,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 /***/ },
-
-/***/ 93:
+/* 4 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -393,8 +394,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 /***/ },
-
-/***/ 94:
+/* 5 */
 /***/ function(module, exports) {
 
 	
@@ -655,7 +655,4 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ }
-
-/******/ })
-});
-;
\ No newline at end of file
+/******/ ]);
\ No newline at end of file
diff --git a/dist/react-widgets.js b/dist/react-widgets.js
index c1e4dae67..c1212c6ff 100644
--- a/dist/react-widgets.js
+++ b/dist/react-widgets.js
@@ -2187,13 +2187,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	function dataIndexOf(data, item, valueField) {
 	  var idx = -1,
 	      len = data.length,
-	      finder = function finder(datum) {
+	      isValueEqual = function isValueEqual(datum) {
 	    return valueMatcher(item, datum, valueField);
 	  };
 
 	  while (++idx < len) {
-	    if (finder(data[idx])) return idx;
-	  }return -1;
+	    var datum = data[idx];
+	    if (datum === item || isValueEqual(datum)) return idx;
+	  }
+
+	  return -1;
 	}
 
 	/**
@@ -2205,15 +2208,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function dataItem(data, item, valueField) {
-	  var first = data[0],
-	      idx;
-
-	  // make an attempt to see if we were passed in dataItem vs just a valueField value
-	  // either an object with the right prop, or a primitive
-	  // { valueField: 5 } || "hello" [ "hello" ]
-	  if ((0, _.has)(item, valueField) || (typeof first === 'undefined' ? 'undefined' : _typeof(first)) === (typeof item === 'undefined' ? 'undefined' : _typeof(item))) return item;
-
-	  idx = dataIndexOf(data, dataValue(item, valueField), valueField);
+	  var idx = dataIndexOf(data, dataValue(item, valueField), valueField);
 
 	  if (idx !== -1) return data[idx];
 
@@ -8715,7 +8710,6 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  mixins: [__webpack_require__(52), __webpack_require__(55), __webpack_require__(56), __webpack_require__(61), __webpack_require__(62)({
 	    willHandle: function willHandle(focused) {
-
 	      focused && this.focus();
 	    },
 	    didHandle: function didHandle(focused) {
@@ -8965,8 +8959,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	    var elementProps = _3.default.omitOwnProps(this, List);
 
 	    var shouldRenderTags = !!dataItems.length,
-	        shouldRenderPopup = open || (0, _widgetHelpers.isFirstFocusedRender)(this),
-	        shouldShowCreate = this._shouldShowCreate();
+	        shouldRenderPopup = (0, _widgetHelpers.isFirstFocusedRender)(this) || open,
+	        shouldShowCreate = this.shouldShowCreate();
 
 	    var tagsID = (0, _widgetHelpers.instanceId)(this, '_taglist'),
 	        listID = (0, _widgetHelpers.instanceId)(this, '__listbox'),
@@ -9082,7 +9076,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    if (key === 'ArrowDown') {
 	      var next = list.next(focusedItem),
-	          creating = this._shouldShowCreate() && focusedItem === next || focusedItem === null;
+	          creating = this.shouldShowCreate() && focusedItem === next || focusedItem === null;
 
 	      next = creating ? null : next;
 
@@ -9136,7 +9130,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    return items;
 	  },
-	  _shouldShowCreate: function _shouldShowCreate() {
+	  shouldShowCreate: function shouldShowCreate() {
 	    var _props6 = this.props;
 	    var textField = _props6.textField;
 	    var searchTerm = _props6.searchTerm;
diff --git a/lib/Multiselect.js b/lib/Multiselect.js
index ceae10307..ec8de5633 100644
--- a/lib/Multiselect.js
+++ b/lib/Multiselect.js
@@ -154,7 +154,6 @@ var Multiselect = _react2.default.createClass((_obj = {
 
   mixins: [require('./mixins/TimeoutMixin'), require('./mixins/DataFilterMixin'), require('./mixins/PopupScrollToMixin'), require('./mixins/RtlParentContextMixin'), require('./mixins/FocusMixin')({
     willHandle: function willHandle(focused) {
-
       focused && this.focus();
     },
     didHandle: function didHandle(focused) {
@@ -404,8 +403,8 @@ var Multiselect = _react2.default.createClass((_obj = {
     var elementProps = _3.default.omitOwnProps(this, List);
 
     var shouldRenderTags = !!dataItems.length,
-        shouldRenderPopup = open || (0, _widgetHelpers.isFirstFocusedRender)(this),
-        shouldShowCreate = this._shouldShowCreate();
+        shouldRenderPopup = (0, _widgetHelpers.isFirstFocusedRender)(this) || open,
+        shouldShowCreate = this.shouldShowCreate();
 
     var tagsID = (0, _widgetHelpers.instanceId)(this, '_taglist'),
         listID = (0, _widgetHelpers.instanceId)(this, '__listbox'),
@@ -521,7 +520,7 @@ var Multiselect = _react2.default.createClass((_obj = {
 
     if (key === 'ArrowDown') {
       var next = list.next(focusedItem),
-          creating = this._shouldShowCreate() && focusedItem === next || focusedItem === null;
+          creating = this.shouldShowCreate() && focusedItem === next || focusedItem === null;
 
       next = creating ? null : next;
 
@@ -575,7 +574,7 @@ var Multiselect = _react2.default.createClass((_obj = {
 
     return items;
   },
-  _shouldShowCreate: function _shouldShowCreate() {
+  shouldShowCreate: function shouldShowCreate() {
     var _props6 = this.props;
     var textField = _props6.textField;
     var searchTerm = _props6.searchTerm;
diff --git a/lib/less/core.less b/lib/less/core.less
index 2fa213937..6641ddd8c 100644
--- a/lib/less/core.less
+++ b/lib/less/core.less
@@ -353,7 +353,7 @@ ul.rw-list {
 .rw-combobox input.rw-input,
 .rw-datetimepicker input.rw-input,
 .rw-numberpicker input.rw-input {
-  .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075)");
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
 }
 
 
diff --git a/lib/less/icons.less b/lib/less/icons.less
index 99b1386c9..5ad09bbe1 100644
--- a/lib/less/icons.less
+++ b/lib/less/icons.less
@@ -1,11 +1,11 @@
 
 @font-face {
   font-family: 'RwWidgets';
-  src: ~"url('@{rw-font-path}/rw-widgets.eot?v=@{rw-version}')";
-  src: ~"url('@{rw-font-path}/rw-widgets.eot?#iefix&v=@{rw-version}') format('embedded-opentype')",
-    ~"url('@{rw-font-path}/rw-widgets.woff?v=@{rw-version}') format('woff')",
-    ~"url('@{rw-font-path}/rw-widgets.ttf?v=@{rw-version}') format('truetype')",
-    ~"url('@{rw-font-path}/rw-widgets.svg?v=@{rw-version}#fontawesomeregular') format('svg')";
+  src: url('@{rw-font-path}/rw-widgets.eot?v=@{rw-version}');
+  src: url('@{rw-font-path}/rw-widgets.eot?#iefix&v=@{rw-version}') format('embedded-opentype'),
+    url('@{rw-font-path}/rw-widgets.woff?v=@{rw-version}') format('woff'),
+    url('@{rw-font-path}/rw-widgets.ttf?v=@{rw-version}') format('truetype'),
+    url('@{rw-font-path}/rw-widgets.svg?v=@{rw-version}#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/lib/scss/bootstrap-theme.scss b/lib/scss/bootstrap-theme.scss
index ad3f68283..058b725f9 100644
--- a/lib/scss/bootstrap-theme.scss
+++ b/lib/scss/bootstrap-theme.scss
@@ -1,60 +1,60 @@
-$gray-base:              #000;
-$gray-darker:            lighten($gray-base, 13.5%); // #222
-$gray-dark:              lighten($gray-base, 20%);   // #333
-$gray:                   lighten($gray-base, 33.5%); // #555
-$gray-light:             lighten($gray-base, 46.7%); // #777
-$gray-lighter:           lighten($gray-base, 93.5%); // #eee
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$gray-dark:              lighten($gray-base, 20%) !default;   // #333
+$gray:                   lighten($gray-base, 33.5%) !default; // #555
+$gray-light:             lighten($gray-base, 46.7%) !default; // #777
+$gray-lighter:           lighten($gray-base, 93.5%) !default; // #eee
 
 
-$text-color:                $gray-dark;
+$text-color:                $gray-dark !default;
 
-$border-radius:             4px;
-$border-radius-sm:          3px;
+$border-radius:             4px !default;
+$border-radius-sm:          3px !default;
 
-$btn-bg:                    #fff;
-$btn-color:                 #333;
-$btn-border:                #ccc;
+$btn-bg:                    #fff !default;
+$btn-color:                 #333 !default;
+$btn-border:                #ccc !default;
 
-$state-bg-select:           darken($btn-border, 12%);
-$state-border-select:       darken($btn-border, 12%);
-$state-color-select:        #333;
+$state-bg-select:           darken($btn-border, 12%) !default;
+$state-border-select:       darken($btn-border, 12%) !default;
+$state-color-select:        #333 !default;
 
-$state-bg-hover:            darken($btn-bg, 10%);
-$state-border-hover:        darken($btn-border, 12%);
-$state-color-hover:         #333;
+$state-bg-hover:            darken($btn-bg, 10%) !default;
+$state-border-hover:        darken($btn-border, 12%) !default;
+$state-color-hover:         #333 !default;
 
-$widget-bg:                 #fff;
-$widget-border:             #ccc;
-$line-height:               1.429em;
+$widget-bg:                 #fff !default;
+$widget-border:             #ccc !default;
+$line-height:               1.429em !default;
 
-$state-bg-focus:            $widget-bg;
-$state-border-focus:        #66afe9;
-$state-color-focus:         #333;
+$state-bg-focus:            $widget-bg !default;
+$state-border-focus:        #66afe9 !default;
+$state-color-focus:         #333 !default;
 
-$input-color:               $gray;
-$input-height:              2.286em;
-$input-padding:             0.429em 0.857em;
-$input-bg:                  #fff;
-$input-bg-disabled:         $gray-lighter;
+$input-color:               $gray !default;
+$input-height:              2.286em !default;
+$input-padding:             0.429em 0.857em !default;
+$input-bg:                  #fff !default;
+$input-bg-disabled:         $gray-lighter !default;
 
-$input-bg-gradient:         none;
-$input-color-placeholder:   #999;
+$input-bg-gradient:         none !default;
+$input-color-placeholder:   #999 !default;
 
-$input-border-radius:       $border-radius;
-$input-border:              #ccc;
-$input-border-width:        1px;
+$input-border-radius:       $border-radius !default;
+$input-border:              #ccc !default;
+$input-border-width:        1px !default;
 
-$input-bg-hover:            $gray-lighter;
-$input-border-hover:        $input-border;
+$input-bg-hover:            $gray-lighter !default;
+$input-border-hover:        $input-border !default;
 
-$input-border-focus:        $state-border-focus;
+$input-border-focus:        $state-border-focus !default;
 
-$dropdown-bg:               $input-bg;
-$dropdown-border:           $input-border;
+$dropdown-bg:               $input-bg !default;
+$dropdown-border:           $input-border !default;
 
-$list-bg-hover:             $state-bg-hover;
-$list-border-hover:         $state-border-hover;
+$list-bg-hover:             $state-bg-hover !default;
+$list-border-hover:         $state-border-hover !default;
 
-$popup-bg:                  $widget-bg;
-$popup-border:              $widget-border;
-$popup-zindex:              1005;
+$popup-bg:                  $widget-bg !default;
+$popup-border:              $widget-border !default;
+$popup-zindex:              1005 !default;
diff --git a/lib/scss/core.scss b/lib/scss/core.scss
index 6947a2fb4..8a0526a7f 100644
--- a/lib/scss/core.scss
+++ b/lib/scss/core.scss
@@ -255,7 +255,7 @@ ul.rw-list {
   }
 }
 
-$focus-rgba: rgba(red($input-border-focus), green($input-border-focus), blue($input-border-focus), .6);
+$focus-rgba: rgba(red($input-border-focus), green($input-border-focus), blue($input-border-focus), .6) !default;
 
 .rw-widget {
   background-color:   $input-bg;
@@ -353,7 +353,7 @@ $focus-rgba: rgba(red($input-border-focus), green($input-border-focus), blue($in
 .rw-combobox input.rw-input,
 .rw-datetimepicker input.rw-input,
 .rw-numberpicker input.rw-input {
-  @include box-shadow("inset 0 1px 1px rgba(0,0,0,.075)");
+  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
 }
 
 
diff --git a/lib/scss/icons.scss b/lib/scss/icons.scss
index 413ee16ea..a495e35a9 100644
--- a/lib/scss/icons.scss
+++ b/lib/scss/icons.scss
@@ -1,11 +1,11 @@
 
 @font-face {
   font-family: 'RwWidgets';
-  src: "url('#{$rw-font-path}/rw-widgets.eot?v=#{$rw-version}')";
-  src: "url('#{$rw-font-path}/rw-widgets.eot?#iefix&v=#{$rw-version}') format('embedded-opentype')",
-    "url('#{$rw-font-path}/rw-widgets.woff?v=#{$rw-version}') format('woff')",
-    "url('#{$rw-font-path}/rw-widgets.ttf?v=#{$rw-version}') format('truetype')",
-    "url('#{$rw-font-path}/rw-widgets.svg?v=#{$rw-version}#fontawesomeregular') format('svg')";
+  src: url('#{$rw-font-path}/rw-widgets.eot?v=#{$rw-version}');
+  src: url('#{$rw-font-path}/rw-widgets.eot?#iefix&v=#{$rw-version}') format('embedded-opentype'),
+    url('#{$rw-font-path}/rw-widgets.woff?v=#{$rw-version}') format('woff'),
+    url('#{$rw-font-path}/rw-widgets.ttf?v=#{$rw-version}') format('truetype'),
+    url('#{$rw-font-path}/rw-widgets.svg?v=#{$rw-version}#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/lib/scss/variables.scss b/lib/scss/variables.scss
index b6231f8be..1e505d7f0 100644
--- a/lib/scss/variables.scss
+++ b/lib/scss/variables.scss
@@ -1,4 +1,4 @@
-$rw-font-path:        "../fonts"; // for referencing Bootstrap CDN font files directly
-$rw-img-path:         "../img";
-$rw-css-prefix:       rw-i;
-$rw-version:          "4.1.0";
+$rw-font-path:        "../fonts" !default; // for referencing Bootstrap CDN font files directly
+$rw-img-path:         "../img" !default;
+$rw-css-prefix:       rw-i !default;
+$rw-version:          "4.1.0" !default;
diff --git a/lib/util/dataHelpers.js b/lib/util/dataHelpers.js
index 6a8dd2901..68c2e7c7a 100644
--- a/lib/util/dataHelpers.js
+++ b/lib/util/dataHelpers.js
@@ -32,13 +32,16 @@ function dataText(item, textField) {
 function dataIndexOf(data, item, valueField) {
   var idx = -1,
       len = data.length,
-      finder = function finder(datum) {
+      isValueEqual = function isValueEqual(datum) {
     return valueMatcher(item, datum, valueField);
   };
 
   while (++idx < len) {
-    if (finder(data[idx])) return idx;
-  }return -1;
+    var datum = data[idx];
+    if (datum === item || isValueEqual(datum)) return idx;
+  }
+
+  return -1;
 }
 
 /**
@@ -50,15 +53,7 @@ function valueMatcher(a, b, valueField) {
 }
 
 function dataItem(data, item, valueField) {
-  var first = data[0],
-      idx;
-
-  // make an attempt to see if we were passed in dataItem vs just a valueField value
-  // either an object with the right prop, or a primitive
-  // { valueField: 5 } || "hello" [ "hello" ]
-  if ((0, _.has)(item, valueField) || (typeof first === 'undefined' ? 'undefined' : _typeof(first)) === (typeof item === 'undefined' ? 'undefined' : _typeof(item))) return item;
-
-  idx = dataIndexOf(data, dataValue(item, valueField), valueField);
+  var idx = dataIndexOf(data, dataValue(item, valueField), valueField);
 
   if (idx !== -1) return data[idx];