diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index cfaad386..3f47ca8b 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -181,6 +181,11 @@ class File(models.Model):
             for type in ox.movie.EXTENSIONS:
                 if data['extension'] in ox.movie.EXTENSIONS[type]:
                     data['type'] = type
+        if data['type'] == 'unknown':
+            if self.info.get('video'):
+                data['type'] = 'video'
+            elif self.info.get('audio'):
+                data['type'] = 'audio'
         if 'part' in data and isinstance(data['part'], int):
             data['part'] = str(data['part'])
         return data
diff --git a/static/js/utils.js b/static/js/utils.js
index 8b626fd5..2b6833f7 100644
--- a/static/js/utils.js
+++ b/static/js/utils.js
@@ -1111,8 +1111,8 @@ pandora.escapeQueryValue = function(value) {
         value = value.toString();
     }
     return value
-        .replace(/%/, '%25')
-        .replace(/&/, '%26')
+        .replace(/%/g, '%25')
+        .replace(/&/g, '%26')
         .replace(/_/g, '%09')
         .replace(/\s/g, '_')
         .replace(/</g, '%0E')