diff --git a/package.json b/package.json
index 7ae9895f..b6f9df2e 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,8 @@
 		"@flowjs/flow.js": "^2.14.0",
 		"@nextcloud/vue": "^2.0.0",
 		"nextcloud-l10n": "^0.1.1",
-		"vue": "^2.6.11"
+		"vue": "^2.6.11",
+		"vue-multiselect": "^2.1.6"
 	},
 	"browserslist": [
 		"extends @nextcloud/browserslist-config"
diff --git a/src/App.vue b/src/App.vue
index 59c77a22..e90ea2b6 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -122,7 +122,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-if="!(file.isComplete() && hideFinished)" v-for="(file, index) in filteredFiles">
+							<tr v-for="(file, index) in filteredFiles">
 								<td class="hideOnMobile">{{index+1}}</td>
 								<td class="ellipsis" v-bind:title="'UID: ' + file.uniqueIdentifier">
 									<span>{{file.relativePath}}</span>
@@ -463,10 +463,16 @@ export default {
 		    var self = this;
 		    
 			if (this.activeLocation.flow) {
-				let sorted;
+				let sorted = this.activeLocation.flow.files;
+				
+				if(this.hideFinished) {
+					sorted = sorted.filter(function(file) {
+						return !(file.isComplete() && !file.error);
+				    });
+				}
 
 				if (this.sort == "name") {
-					sorted = this.activeLocation.flow.files.sort(function(a, b) {
+					sorted = sorted.sort(function(a, b) {
 						console.log(a);
 						var nameA = a.relativePath.toLowerCase(),
 							nameB = b.relativePath.toLowerCase()
@@ -477,15 +483,15 @@ export default {
 						return 0 //default return value (no sorting)
 					});
 				} else if (this.sort == "size") {
-					sorted = this.activeLocation.flow.files.sort(function(a, b) {
+					sorted = sorted.sort(function(a, b) {
 						return b.size - a.size
 					});
 				} else if (this.sort == "progress") {
-					sorted = this.activeLocation.flow.files.sort(function(a, b) {
+					sorted = sorted.sort(function(a, b) {
 						return b.progress() - a.progress()
 					});
 				} else if (this.sort == "uploadspeed") {
-					sorted = this.activeLocation.flow.files.sort(function(a, b) {
+					sorted = sorted.sort(function(a, b) {
 						return b.averageSpeed - a.averageSpeed
 					});
 				}