diff --git a/src/components/Modals/RenameModal.vue b/src/components/Modals/RenameModal.vue
index 5965f37f..2546083e 100644
--- a/src/components/Modals/RenameModal.vue
+++ b/src/components/Modals/RenameModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-dialog v-model="dialog" scrollable max-width="750px" :content-class="isPhone ? 'rounded-0' : 'rounded-form'" :fullscreen="isPhone">
+  <v-dialog v-model="dialog" scrollable max-width="750px" :content-class="phoneLayout ? 'rounded-0' : 'rounded-form'" :fullscreen="phoneLayout">
     <v-card>
       <v-card-title class="pa-0">
         <v-toolbar-title class="ma-4 primarytext--text">
@@ -52,9 +52,6 @@ export default {
     ...mapGetters(['getTorrent']),
     torrent() {
       return this.getTorrent(this.hash)
-    },
-    isPhone() {
-      return this.$vuetify.breakpoint.xsOnly
     }
   },
   mounted() {
@@ -75,7 +72,7 @@ export default {
     isUrl() {
       this.enableUrlDecode = false
       if (this.name.indexOf(' ') === -1) {
-        const exp = /\+|%/
+        const exp = /[+%]/
         if (exp.test(this.name)) this.enableUrlDecode = true
       }
     },
diff --git a/src/services/qbit.ts b/src/services/qbit.ts
index 5ad79d73..0a7e6590 100644
--- a/src/services/qbit.ts
+++ b/src/services/qbit.ts
@@ -141,7 +141,7 @@ export class QBitApi {
   }
 
   async getAvailableTags(): Promise<string[]> {
-    return this.axios.get('/torrents/tags').then(res => res.data)
+    return this.axios.get('/torrents/tags').then(res => res.data.sort((a: string, b: string) => a.localeCompare(b.toLowerCase(), undefined, {sensitivity: 'base'})))
   }
 
   async getTorrentProperties(hash: string): Promise<TorrentProperties> {