diff --git a/CHANGELOG.md b/CHANGELOG.md
index e30e98935..e8413d3ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,9 @@
 - Updated DiscoverComponent, allow unathenicated if enabled. ([a1059a6e](https://github.com/pixelfed/pixelfed/commit/a1059a6e))
 - Updated components, improve content warnings. ([a9e98965](https://github.com/pixelfed/pixelfed/commit/a9e98965))
 - Updated ComposeModal, prevent tagging empty users. Fixes #2633. ([ceae664c](https://github.com/pixelfed/pixelfed/commit/ceae664c))
+- Updated ComposeModal, show filter warning for unsupported browsers. ([12ce7602](https://github.com/pixelfed/pixelfed/commit/12ce7602))
+- Updated Hashtag component, fix null infinite loading bug. Fixes #2637. ([55136518](https://github.com/pixelfed/pixelfed/commit/55136518))
+- Updated filesystems config, add backup driver to store backups on other filesystems. ([ae90eef9](https://github.com/pixelfed/pixelfed/commit/ae90eef9))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10)
diff --git a/config/filesystems.php b/config/filesystems.php
index e48490f09..0df7cf308 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -81,6 +81,19 @@ return [
             'url' => str_replace(env('DO_SPACES_REGION'),env('DO_SPACES_BUCKET').'.'.env('DO_SPACES_REGION'),str_replace("digitaloceanspaces","cdn.digitaloceanspaces",env('DO_SPACES_ENDPOINT'))),
         ],
 
+        'backup' => [
+            'driver' => env('PF_BACKUP_DRIVER', 'local'),
+            'visibility' => 'private',
+            'root' => env('PF_BACKUP_DRIVER', 'local') == 'local' ?
+                storage_path('app/backups/') :
+                env('PF_BACKUP_ROOT','/'),
+            'key' => env('PF_BACKUP_KEY'),
+            'secret' => env('PF_BACKUP_SECRET'),
+            'endpoint' => env('PF_BACKUP_ENDPOINT'),
+            'region' => env('PF_BACKUP_REGION'),
+            'bucket' => env('PF_BACKUP_BUCKET'),
+        ],
+
     ],
 
 ];
diff --git a/public/js/compose.js b/public/js/compose.js
index 5a41d47bb..6da03b4a7 100644
Binary files a/public/js/compose.js and b/public/js/compose.js differ
diff --git a/public/js/hashtag.js b/public/js/hashtag.js
index 686a783b8..374b06b42 100644
Binary files a/public/js/hashtag.js and b/public/js/hashtag.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 481945713..cd79457ab 100644
Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ
diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue
index 606427265..729cc03aa 100644
--- a/resources/assets/js/components/ComposeModal.vue
+++ b/resources/assets/js/components/ComposeModal.vue
@@ -1131,7 +1131,7 @@ export default {
 			// this is where the magic happens
 			var ua = navigator.userAgent.toLowerCase();
 			if(ua.indexOf('firefox') == -1 && ua.indexOf('chrome') == -1) {
-			 	// swal('Oops!', 'Your browser does not support the filter feature. Please use Chrome or Firefox if you want to apply a filter.', 'error');
+			 	swal('Oops!', 'Your browser does not support the filter feature.', 'error');
 			 	return;
 			}
 
diff --git a/resources/assets/js/components/Hashtag.vue b/resources/assets/js/components/Hashtag.vue
index 47ff9f36d..0a792998f 100644
--- a/resources/assets/js/components/Hashtag.vue
+++ b/resources/assets/js/components/Hashtag.vue
@@ -168,7 +168,7 @@
 				}).then(res => {
 					let data = res.data;
 					let tags = data.tags.filter(n => {
-						if(!n || n.length == 0) {
+						if(!n || n.length == 0 || n.status == null) {
 							return false;
 						}
 						return true;
@@ -195,7 +195,7 @@
 					let data = res.data;
 					if(data.tags.length) {
 						let tags = data.tags.filter(n => {
-							if(!n || n.length == 0) {
+							if(!n || n.length == 0 || n.status == null) {
 								return false;
 							}
 							return true;
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
index 5e39b5eed..693e05ed8 100755
--- a/storage/app/.gitignore
+++ b/storage/app/.gitignore
@@ -1,4 +1,5 @@
 *
+!backups/
 !public/
 !remcache/
 !cities.json
diff --git a/storage/app/backups/.gitignore b/storage/app/backups/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/storage/app/backups/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore