diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 93c36597a..184038d79 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -944,6 +944,7 @@ define([
 
             // Ctrl+A select all
             if (e.which === 65 && (e.ctrlKey || (e.metaKey && APP.isMac))) {
+                e.preventDefault();
                 $content.find('.cp-app-drive-element:not(.cp-app-drive-element-selected)')
                     .each(function (idx, element) {
                         selectElement($(element));
diff --git a/www/common/translations/messages.ca.json b/www/common/translations/messages.ca.json
index a10a9fffd..7bff4cb27 100644
--- a/www/common/translations/messages.ca.json
+++ b/www/common/translations/messages.ca.json
@@ -148,7 +148,6 @@
     "or": "o",
     "tags_title": "Etiquetes (només vostres)",
     "tags_add": "Actualitza les etiquetes d'aquesta pàgina",
-    "tags_searchHint": "Inicieu una cerca amb # al vostre CryptDrive per trobar els vostres documents etiquetats.",
     "tags_notShared": "Les vostres etiquetes no es comparteixen amb altres persones usuàries",
     "tags_duplicate": "Etiquetes duplicades: {0}",
     "tags_noentry": "No podeu etiquetar un document esborrat!",
diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 0ed8f0f91..e792c6cc8 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -146,7 +146,6 @@
     "or": "oder",
     "tags_title": "Tags (nur für dich)",
     "tags_add": "Tags der ausgewählten Pads bearbeiten",
-    "tags_searchHint": "Beginne die Suche in deinem CryptDrive mit #, um getaggte Dokumente zu finden.",
     "tags_notShared": "Deine Tags werden nicht mit anderen Benutzern geteilt",
     "tags_duplicate": "Doppeltes Tag: {0}",
     "tags_noentry": "Du kannst keine Tags zu einem gelöschten Pad hinzufügen!",
diff --git a/www/common/translations/messages.el.json b/www/common/translations/messages.el.json
index 5f3f455c1..406a445f2 100644
--- a/www/common/translations/messages.el.json
+++ b/www/common/translations/messages.el.json
@@ -119,7 +119,6 @@
     "or": "ή",
     "tags_title": "Ετικέτες (για εσάς μόνο)",
     "tags_add": "Ενημερώστε τις ετικέτες αυτής της σελίδας",
-    "tags_searchHint": "Ξεκινήστε μια αναζήτηση με το σύμβολο # στο CryptDrive σας για να βρείτε pads με ετικέτες.",
     "tags_notShared": "Οι ετικέτες σας δεν μοιράζονται με άλλους χρήστες",
     "tags_duplicate": "Διπλή ετικέτα: {0}",
     "tags_noentry": "Δεν μπορείτε να βάλετε ετικέτα σε διεγραμένο pad!",
diff --git a/www/common/translations/messages.es.json b/www/common/translations/messages.es.json
index 83ccb01e5..bc526986d 100644
--- a/www/common/translations/messages.es.json
+++ b/www/common/translations/messages.es.json
@@ -472,7 +472,6 @@
     "printBackgroundRemove": "Eliminar este fondo de pantalla",
     "tags_title": "Etiquetas (sólo para tí)",
     "tags_add": "Actualizar las etiquetas de esta página",
-    "tags_searchHint": "Comenzar una búsqueda con # en tú CryptDrive para encontrar las notas etiquetadas.",
     "tags_notShared": "Tus etiquetas no están compartidas con otros usuarios",
     "tags_duplicate": "Duplicar etiquetas:{0}",
     "tags_noentry": "No puedes etiquetar una nota eliminada!",
diff --git a/www/common/translations/messages.fi.json b/www/common/translations/messages.fi.json
index 8a4e36139..0022dc74c 100644
--- a/www/common/translations/messages.fi.json
+++ b/www/common/translations/messages.fi.json
@@ -151,7 +151,6 @@
     "or": "tai",
     "tags_title": "Tunnisteet (vain sinulle)",
     "tags_add": "Päivitä sivun tunnisteet",
-    "tags_searchHint": "Aloita hakusi CryptDrivessa #-merkillä löytääksesi tunnisteita sisältävät padit.",
     "tags_notShared": "Tunnisteitasi ei jaeta muiden käyttäjien kanssa",
     "tags_duplicate": "Kaksinkertainen tunniste: {0}",
     "tags_noentry": "Et voi lisätä tunnistetta poistettuun padiin!",
diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index f38f3f5ef..77e81fcf5 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -148,7 +148,6 @@
     "or": "ou",
     "tags_title": "Mots-clés du pad (pour vous uniquement)",
     "tags_add": "Modifier les mots-clés de la sélection",
-    "tags_searchHint": "Commencez une recherche par # dans votre CryptDrive pour retrouver vos pads par mot-clé.",
     "tags_notShared": "Vos mots-clés ne sont pas partagés avec les autres utilisateurs",
     "tags_duplicate": "Mot-clé déjà présent : {0}",
     "tags_noentry": "Vous ne pouvez pas ajouter de mots-clés à un pad supprimé !",
diff --git a/www/common/translations/messages.it.json b/www/common/translations/messages.it.json
index 16fca3d13..5c654c94d 100644
--- a/www/common/translations/messages.it.json
+++ b/www/common/translations/messages.it.json
@@ -148,7 +148,6 @@
     "or": "o",
     "tags_title": "Tag (mostrati solo a te)",
     "tags_add": "Aggiorna i tag di questa pagina",
-    "tags_searchHint": "Inizia una ricerca con # nel tuo CryptDrive per trovare i pad taggati.",
     "tags_notShared": "I tuoi tag non sono condivisi con altri utenti",
     "tags_duplicate": "Duplica tag: {0}",
     "tags_noentry": "Non puoi taggare un pad eliminato!",
diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 5cad912da..2fcf5db4f 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -151,7 +151,6 @@
     "or": "or",
     "tags_title": "Tags (for you only)",
     "tags_add": "Update the tags for selected pads",
-    "tags_searchHint": "Start a search with # in your CryptDrive to find your tagged pads.",
     "tags_notShared": "Your tags are not shared with other users",
     "tags_duplicate": "Duplicate tag: {0}",
     "tags_noentry": "You can't tag a deleted pad!",
diff --git a/www/common/translations/messages.nb.json b/www/common/translations/messages.nb.json
index 881bcc8df..5a59a7829 100644
--- a/www/common/translations/messages.nb.json
+++ b/www/common/translations/messages.nb.json
@@ -140,7 +140,6 @@
     "or": "eller",
     "tags_title": "Tags (kun for ditt bruk)",
     "tags_add": "Oppdater tags for denne sida",
-    "tags_searchHint": "Søk med # i CryptDriven din for å finne pads med slike tags.",
     "tags_notShared": "Dine tags deles ikke med andre brukerer",
     "tags_duplicate": "Dupliser tag:{0}",
     "tags_noentry": "Du kan ikke tagge en sletta pad!",
diff --git a/www/common/translations/messages.nl.json b/www/common/translations/messages.nl.json
index e2da9e201..124e3dc0c 100644
--- a/www/common/translations/messages.nl.json
+++ b/www/common/translations/messages.nl.json
@@ -74,7 +74,6 @@
     "tags_noentry": "U kunt een verwijderde werkomgeving niet markeren!",
     "tags_duplicate": "Gedupliceerde markering: {0}",
     "tags_notShared": "Uw markeringen worden niet gedeeld met andere gebruikers",
-    "tags_searchHint": "Begin een zoekopdracht met # in uw CryptDrive om gemarkeerde werkomgevingen te vinden.",
     "tags_add": "Werk de markeringen van deze pagina bij",
     "tags_title": "Markeringen (alleen voor u)",
     "or": "of",
diff --git a/www/common/translations/messages.pt-br.json b/www/common/translations/messages.pt-br.json
index f0747694d..e10f3e3c7 100644
--- a/www/common/translations/messages.pt-br.json
+++ b/www/common/translations/messages.pt-br.json
@@ -392,7 +392,6 @@
     "or": "",
     "tags_title": "",
     "tags_add": "",
-    "tags_searchHint": "",
     "tags_notShared": "",
     "tags_duplicate": "",
     "tags_noentry": "",
diff --git a/www/common/translations/messages.ro.json b/www/common/translations/messages.ro.json
index 190f3250a..14c4aefe0 100644
--- a/www/common/translations/messages.ro.json
+++ b/www/common/translations/messages.ro.json
@@ -382,7 +382,6 @@
     "or": "sau",
     "tags_title": "Etichete (doar pentru tine)",
     "tags_add": "Updatează etichetele acestei pagini",
-    "tags_searchHint": "Începe o căutare cu # în CryptDrive-ul tău pentru a găsi pad-uri etichetate",
     "tags_notShared": "Etichetele tale nu sunt împărțite cu alți utilizatori",
     "tags_duplicate": "Duplică eticheta: {0}",
     "tags_noentry": "Nu poți eticheta un pad șters",
diff --git a/www/common/translations/messages.ru.json b/www/common/translations/messages.ru.json
index 865394b94..b0b1dbe1b 100644
--- a/www/common/translations/messages.ru.json
+++ b/www/common/translations/messages.ru.json
@@ -140,7 +140,6 @@
     "or": "или",
     "tags_title": "Теги (только для вас)",
     "tags_add": "Обновить теги страницы",
-    "tags_searchHint": "Начните поиск в вашем CryptDrive при помощи # чтобы найти пэды с тегами.",
     "tags_notShared": "Ваши теги не разделяются с другими пользователями",
     "button_newsheet": "Новый Лист",
     "newButtonTitle": "создать новую запись",
diff --git a/www/common/translations/messages.sv.json b/www/common/translations/messages.sv.json
index 85a199284..8876beebf 100644
--- a/www/common/translations/messages.sv.json
+++ b/www/common/translations/messages.sv.json
@@ -38,7 +38,6 @@
     "tags_noentry": "Du kan inte tagga ett raderat dokument!",
     "tags_duplicate": "Duplicera tagg: {0}",
     "tags_notShared": "Dina taggar är inte delade med andra användare",
-    "tags_searchHint": "Påbörja en sökning med # i din CryptDrive för att hitta dina taggade dokument.",
     "tags_add": "Uppdatera taggar för denna sida",
     "tags_title": "Taggar (endast för dig)",
     "or": "eller",
diff --git a/www/support/ui.js b/www/support/ui.js
index 8451cf55c..c099634b7 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -91,6 +91,7 @@ define([
                 name: $el.attr('data-name')
             });
         });
+        $attachments.html('');
 
         send(ctx, id, 'TICKET', {
             category: category,
@@ -207,7 +208,8 @@ Messages.support_addAttachment = "Add attachment"; // XXX
 
                         $(attachments).append(span);
                     };
-                    ctx.FM.handleFile(file, ev);
+                    // The empty object allows us to bypass the file upload modal
+                    ctx.FM.handleFile(file, ev, {});
                 });
             });
             $input.click();
@@ -242,7 +244,7 @@ Messages.support_addAttachment = "Add attachment"; // XXX
 
         var url;
         if (ctx.isAdmin) {
-            ticketCategory = Messages['support_cat_'+(content.category || 'other')] + ' - ';
+            ticketCategory = Messages['support_cat_'+(content.category || 'all')] + ' - ';
             url = h('button.btn.btn-primary.fa.fa-clipboard');
             $(url).click(function () {
                 var link = privateData.origin + privateData.pathname + '#' + 'support-' + content.id;