diff --git a/package.json b/package.json
index 0a1031a..d6e48c3 100644
--- a/package.json
+++ b/package.json
@@ -59,11 +59,11 @@
     "sass-loader": "^3.2.0",
     "shelljs": "^0.7.0",
     "url-loader": "^0.5.7",
-    "vue": "^1.0.24",
+    "vue": "^2.0.3",
     "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.3.0",
-    "vue-resource": "^0.8.0",
+    "vue-html-loader": "^1.2.3",
+    "vue-loader": "^9.6.0",
+    "vue-resource": "^1.0.3",
     "vue-style-loader": "^1.0.0",
     "vuex": "^0.6.3",
     "webpack": "^1.12.2",
diff --git a/src/components/Select.vue b/src/components/Select.vue
index 9367c74..6bb879e 100644
--- a/src/components/Select.vue
+++ b/src/components/Select.vue
@@ -214,6 +214,8 @@
 			</li>
 			<transition name="fade">
 				<li v-if="!filteredOptions.length" class="divider"></li>
+			</transition>
+			<transition name="fade">
 				<li v-if="!filteredOptions.length" class="text-center">
 					<slot name="no-options">Sorry, no matching options.</slot>
 				</li>
@@ -605,7 +607,7 @@
 			 * @return {array}
 			 */
 			filteredOptions() {
-				let options = this.$options.filters.filterBy(this.options, this.search)
+				let options = this.$options.filters.filterBy?this.$options.filters.filterBy(this.options, this.search):this.options
 				if (this.taggable && this.search.length && !this.optionExists(this.search)) {
 					options.unshift(this.search)
 				}
diff --git a/src/mixins/ajax.js b/src/mixins/ajax.js
index a62842c..e86feaa 100644
--- a/src/mixins/ajax.js
+++ b/src/mixins/ajax.js
@@ -23,7 +23,7 @@ module.exports = {
 		 */
 		onSearch: {
 			type: Function,
-			default: false
+			default: function(search, loading){}
 		},
 
 		/**