diff --git a/package-lock.json b/package-lock.json
index 2b5930e5..3315e757 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6364,8 +6364,7 @@
     "lodash": {
       "version": "4.17.11",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-      "dev": true
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
     },
     "lodash.assign": {
       "version": "4.2.0",
diff --git a/package.json b/package.json
index dd2e8614..9d49a1f7 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
 		"dist"
 	],
 	"dependencies": {
+		"lodash": "^4.17.11",
 		"nextcloud-axios": "^0.1.2",
 		"nextcloud-vue": "^0.9.0",
 		"v-tooltip": "^2.0.0-rc.33",
diff --git a/src/collectionservice.js b/src/collectionservice.js
index d2460206..93470065 100644
--- a/src/collectionservice.js
+++ b/src/collectionservice.js
@@ -48,13 +48,6 @@ class CollectionService {
 			.then(result => {
 				return result.data.ocs.data
 			})
-			.catch(error => {
-				if (error.response.status === 404) {
-					return []
-				}
-				console.error(error)
-				return Promise.reject(error)
-			})
 	}
 
 	createCollection(resourceType, resourceId, name) {
@@ -65,10 +58,6 @@ class CollectionService {
 			.then((response) => {
 				return response.data.ocs.data
 			})
-			.catch(error => {
-				console.error(error)
-				return Promise.reject(error)
-			})
 	}
 
 	addResource(collectionId, resourceType, resourceId) {
@@ -90,8 +79,9 @@ class CollectionService {
 	}
 
 	search(query) {
+		query = encodeURI(query)
 		const searchBase = OC.linkToOCS('collaboration/resources/collections/search', 2)
-		return this.http.get(`${searchBase}%25${query}%25?format=json`)
+		return this.http.get(`${searchBase}${query}?format=json`)
 			.then((response) => {
 				return response.data.ocs.data
 			})
diff --git a/src/components/CollectionList.vue b/src/components/CollectionList.vue
index cada590b..e8a73439 100644
--- a/src/components/CollectionList.vue
+++ b/src/components/CollectionList.vue
@@ -38,12 +38,17 @@
 				<template slot="option" slot-scope="props">
 					<span class="option__wrapper">
 						<span v-if="props.option.class" :class="props.option.class" class="avatar" />
-						<avatar v-else :display-name="props.option.title" :allow-placeholder="true" />
+						<avatar v-else-if="props.option.method !== 2" :display-name="props.option.title" :allow-placeholder="true" />
 						<span class="option__title">{{ props.option.title }}</span>
 					</span>
 				</template>
 			</multiselect>
 		</li>
+		<transition name="fade">
+			<li v-if="error" class="error">
+				{{ error }}
+			</li>
+		</transition>
 		<collection-list-item v-for="collection in collections" :key="collection.id" :collection="collection" />
 	</ul>
 </template>
@@ -97,6 +102,13 @@
 		}
 	}
 
+	.fade-enter-active, .fade-leave-active {
+		transition: opacity .5s;
+	}
+	.fade-enter, .fade-leave-to {
+		opacity: 0;
+	}
+
 </style>
 <style lang="scss">
 	/** TODO check why this doesn't work when scoped */
@@ -112,6 +124,8 @@
 
 import Vue from 'vue'
 import Vuex from 'vuex'
+import debounce from 'lodash/debounce'
+
 import CollectionListItem from '../components/CollectionListItem'
 import { CollectionStoreModule } from '../collectionstore'
 import Avatar from 'nextcloud-vue/dist/Components/Avatar'
@@ -122,6 +136,21 @@ const store = new Vuex.Store(CollectionStoreModule)
 
 const METHOD_CREATE_COLLECTION = 0
 const METHOD_ADD_TO_COLLECTION = 1
+const METHOD_HINT = 2
+
+const _debouncedSearch = debounce(
+	function(query) {
+		if (query !== '') {
+			this.$store.dispatch('search', query).then((collections) => {
+				this.searchCollections = collections
+			}).catch(e => {
+				console.error('Failed to search for collections', e)
+			})
+		}
+	},
+	500, {}
+)
+
 export default {
 	name: 'CollectionList',
 	store,
@@ -160,7 +189,8 @@ export default {
 			codes: undefined,
 			value: null,
 			model: {},
-			searchCollections: []
+			searchCollections: [],
+			error: null
 		}
 	},
 	computed: {
@@ -168,7 +198,7 @@ export default {
 			return this.$store.getters.collectionsByResource(this.type, this.id)
 		},
 		placeholder() {
-			return t('files_sharing', 'Add to a collection')
+			return t('core', 'Add to a collection')
 		},
 		options() {
 			let options = []
@@ -191,6 +221,12 @@ export default {
 					})
 				}
 			}
+			if (this.searchCollections.length === 0) {
+				options.push({
+					method: METHOD_HINT,
+					title: 'Type to search for existing collections'
+				})
+			}
 			return options
 		}
 	},
@@ -210,6 +246,8 @@ export default {
 						resourceType: selectedOption.type,
 						resourceId: id,
 						name: this.name
+					}).catch((e) => {
+						this.setError(t('core', 'Failed to create collection'), e)
 					})
 				}).catch((e) => {
 					console.error('No resource selected', e)
@@ -219,13 +257,13 @@ export default {
 			if (selectedOption.method === METHOD_ADD_TO_COLLECTION) {
 				this.$store.dispatch('addResourceToCollection', {
 					collectionId: selectedOption.collectionId, resourceType: this.type, resourceId: this.id
+				}).catch((e) => {
+					this.setError(t('core', 'Failed to add resource to collection'), e)
 				})
 			}
 		},
 		search(query) {
-			this.$store.dispatch('search', query).then((collections) => {
-				this.searchCollections = collections
-			})
+			_debouncedSearch.bind(this)(query)
 		},
 		showSelect() {
 			this.selectIsOpen = true
@@ -236,6 +274,13 @@ export default {
 		},
 		isVueComponent(object) {
 			return object._isVue
+		},
+		setError(error, e) {
+			console.error(error, e)
+			this.error = error
+			setTimeout(() => {
+				this.error = null
+			}, 5000)
 		}
 	}
 }
diff --git a/src/components/CollectionListItem.vue b/src/components/CollectionListItem.vue
index 0b82fe68..5d1549c6 100644
--- a/src/components/CollectionListItem.vue
+++ b/src/components/CollectionListItem.vue
@@ -25,21 +25,24 @@
 		<avatar :display-name="collection.name" :allow-placeholder="true" class="collection-avatar" />
 		<span v-if="newName === null" class="collection-item-name" title=""
 			@click="showDetails">{{ collection.name }}</span>
-		<form v-else @submit.prevent="renameCollection">
+		<form v-else :class="{'shouldshake': error.rename }" @submit.prevent="renameCollection">
 			<input v-model="newName" type="text" autocomplete="off"
 				autocapitalize="off">
 			<input type="submit" value="" class="icon-confirm">
 		</form>
-		<transition name="fade">
-			<div v-if="!detailsOpen" class="linked-icons">
-				<a v-for="resource in limitedResources(collection)" :key="resource.type + '|' + resource.id" v-tooltip="resource.name"
-					:href="resource.link" :class="typeClass(resource)"><img :src="iconUrl(resource)"></a>
-			</div>
-		</transition>
+		<div v-if="!detailsOpen && newName === null" class="linked-icons">
+			<a v-for="resource in limitedResources(collection)" :key="resource.type + '|' + resource.id" v-tooltip="resource.name"
+				:href="resource.link" :class="typeClass(resource)"><img :src="iconUrl(resource)"></a>
+		</div>
 
-		<span class="sharingOptionsGroup">
+		<span v-if="newName === null" class="sharingOptionsGroup">
 			<action :actions="menu" />
 		</span>
+		<transition name="fade">
+			<div v-if="error.rename" class="error">
+				{{ error.rename }}
+			</div>
+		</transition>
 		<transition name="fade">
 			<ul v-if="detailsOpen" class="resource-list-details">
 				<li v-for="resource in collection.resources" :key="resource.type + '|' + resource.id" :class="typeClass(resource)">
@@ -52,6 +55,7 @@
 </template>
 
 <script>
+import Vue from 'vue'
 import Action from 'nextcloud-vue/dist/Components/Action'
 import Avatar from 'nextcloud-vue/dist/Components/Avatar'
 import Tooltip from 'nextcloud-vue/dist/Directives/Tooltip'
@@ -73,7 +77,8 @@ export default {
 		return {
 			isOpen: false,
 			detailsOpen: false,
-			newName: null
+			newName: null,
+			error: {}
 		}
 	},
 	computed: {
@@ -86,12 +91,12 @@ export default {
 						this.isOpen = false
 					},
 					icon: 'icon-info',
-					text: !this.detailsOpen ? t('files_sharing', 'Show details') : t('files_sharing', 'Hide details')
+					text: !this.detailsOpen ? t('core', 'Show details') : t('core', 'Hide details')
 				},
 				{
 					action: () => this.openRename(),
 					icon: 'icon-rename',
-					text: t('files_sharing', 'Rename collection')
+					text: t('core', 'Rename collection')
 				}
 			]
 		},
@@ -141,11 +146,21 @@ export default {
 			this.newName = this.collection.name
 		},
 		renameCollection() {
+			if (this.newName === '') {
+				this.newName = null
+				return
+			}
 			this.$store.dispatch('renameCollection', {
 				collectionId: this.collection.id,
 				name: this.newName
 			}).then((collection) => {
 				this.newName = null
+			}).catch((e) => {
+				Vue.set(this.error, 'rename', t('core', 'Failed to rename collection'))
+				console.error(e)
+				setTimeout(() => {
+					Vue.set(this.error, 'rename', null)
+				}, 3000)
 			})
 		}
 	}
@@ -202,6 +217,10 @@ export default {
 			margin-top: 4px;
 			flex-grow: 1;
 		}
+		.error {
+			flex-basis: 100%;
+			width: 100%;
+		}
 		.resource-list-details {
 			flex-basis: 100%;
 			width: 100%;
@@ -247,4 +266,20 @@ export default {
 			}
 		}
 	}
+
+	.shouldshake {
+		animation: shake 0.6s 1 linear;
+	}
+	@keyframes shake {
+		0% { transform: translate(15px); }
+		20% { transform: translate(-15px); }
+		40% { transform: translate(7px); }
+		60% { transform: translate(-7px); }
+		80% { transform: translate(3px); }
+		100% { transform: translate(0px); }
+	}
+</style>
+
+<style>
+
 </style>