diff --git a/pandora/0xdb.json b/pandora/0xdb.json
index e92730ff..1541a8a7 100644
--- a/pandora/0xdb.json
+++ b/pandora/0xdb.json
@@ -1,23 +1,4 @@
 {
-    "findKeys": [
-        {"id": "all", "title": "All"},
-        {"id": "title", "title": "Title", "autocomplete": true, "autocompleteSortKey": "votes"},
-        {"id": "director", "title": "Director", "autocomplete": true},
-        {"id": "country", "title": "Country", "autocomplete": true},
-        {"id": "year", "title": "Year", "autocomplete": true},
-        {"id": "language", "title": "Language", "autocomplete": true},
-        {"id": "writer", "title": "Writer", "autocomplete": true},
-        {"id": "producer", "title": "Producer", "autocomplete": true},
-        {"id": "cinematographer", "title": "Cinematographer", "autocomplete": true},
-        {"id": "editor", "title": "Editor", "autocomplete": true},
-        {"id": "actor", "title": "Actor", "autocomplete": true},
-        {"id": "character", "title": "Character", "autocomplete": true},
-        {"id": "name", "title": "Name", "autocomplete": true},
-        {"id": "genre", "title": "Genre", "autocomplete": true},
-        {"id": "keyword", "title": "Keyword", "autocomplete": true},
-        {"id": "summary", "title": "Summary"},
-        {"id": "dialog", "title": "Dialog"}
-    ],
     "groups": [
         {"id": "director", "title": "Director"},
         {"id": "country", "title": "Country"},
@@ -32,6 +13,11 @@
         {"id": "keyword", "title": "Keyword"}
     ],
     "itemKeys": [
+        {
+            "id": "all",
+            "title": "All",
+            "find": true
+        },
         {
             "id": "title",
             "title": "Title",
@@ -474,50 +460,6 @@
         {"id": "faq", "title": "Frequently Asked Questions"},
         {"id": "terms", "title": "Terms of Service"}
     ],
-    "sortKeys": [
-        {"id": "title", "title": "Title", "width": 180, "removable": false, "type": "title"},
-        {"id": "director", "title": "Director", "width": 180, "removable": false, "type": "person"},
-        {"id": "country", "title": "Country", "width": 120, "type": "string"},
-        {"id": "year", "title": "Year", "width": 60, "type": "year"},
-        {"id": "language", "title": "Language", "width": 120, "type": "string"},
-        {"id": "runtime", "title": "Runtime", "width": 60, "type": "integer", "format": {"type": "duration", "args": [0, "medium"]}},
-        {"id": "writer", "title": "Writer", "width": 180, "type": "person"},
-        {"id": "producer", "title": "Producer", "width": 180, "type": "person"},
-        {"id": "cinematographer", "title": "Cinematographer", "width": 180, "type": "person"},
-        {"id": "editor", "title": "Editor", "width": 180, "type": "person"},
-        {"id": "numberofactors", "title": "Number of Actors", "width": 60, "key": "actor", "type": "length"},
-        {"id": "genre", "title": "Genre", "width": 120, "type": "string"},
-        {"id": "numberofkeywords", "title": "Number of Keywords", "width": 60, "key": "keyword", "type": "length"},
-        {"id": "wordsinsummary", "title": "Words in Summary", "width": 60, "key": "summary", "type": "words"},
-        {"id": "wordsintrivia", "title": "Words in Trivia", "width": 60, "key": "trivia", "type": "words"},
-        {"id": "releasedate", "title": "Release Date", "width": 120, "type": "date", "format": {"type": "date", "args": ["%a, %b %e, %Y"]}},
-        {"id": "budget", "title": "Budget", "width": 90, "type": "integer", "format": {"type": "currency", "args": ["$", 0]}},
-        {"id": "gross", "title": "Gross", "width": 90, "type": "integer", "format": {"type": "currency", "args": ["$", 0]}},
-        {"id": "profit", "title": "Profit", "width": 90, "type": "integer", "format": {"type": "currency", "args": ["$", 0]}},
-        {"id": "rating", "title": "Rating", "width": 60, "type": "float", "format": {"type": "percent", "args": [10, 2]}},
-        {"id": "votes", "title": "Votes", "width": 60, "type": "integer", "format": {"type": "percent", "args": [403824, 2]}},
-        {"id": "id", "title": "ID", "width": 90, "type": "string"},
-        {"id": "aspectratio", "title": "Aspect Ratio", "width": 90, "type": "float"},
-        {"id": "duration", "title": "Duration", "width": 90, "type": "float"},
-        {"id": "color", "title": "Color", "width": 90, "type": "float"},
-        {"id": "saturation", "title": "Saturation", "width": 60, "type": "float"},
-        {"id": "brightness", "title": "Brightness", "width": 60, "type": "float"},
-        {"id": "volume", "title": "Volume", "width": 60, "type": "float"},
-        {"id": "clips", "title": "Clips", "width": 60, "type": "integer"},
-        {"id": "cuts", "title": "Cuts", "width": 60, "type": "integer"},
-        {"id": "cutsperminute", "title": "Cuts per Minute", "width": 60, "type": "float"},
-        {"id": "words", "title": "Words", "width": 60, "type": "integer"},
-        {"id": "wordsperminute", "title": "Words per Minute", "width": 60, "type": "float"},
-        {"id": "resolution", "title": "Resolution", "width": 90, "type": "integer"},
-        {"id": "pixels", "title": "Pixels", "width": 90, "type": "integer"},
-        {"id": "size", "title": "Size", "width": 90, "type": "integer"},
-        {"id": "bitrate", "title": "Bitrate", "width": 90, "type": "integer"},
-        {"id": "files", "title": "Files", "width": 60, "type": "integer"},
-        {"id": "filename", "title": "Filename", "width": 180, "type": "string"},
-        {"id": "published", "title": "Date Published", "width": 90, "type": "date"},
-        {"id": "modified", "title": "Date Modified", "width": 90, "type": "date"},
-        {"id": "popularity", "title": "Popularity", "type": "float"}
-    ],
     "totals": [
         {"id": "items"},
         {"id": "runtime"},
diff --git a/static/js/pandora/ui/findElement.js b/static/js/pandora/ui/findElement.js
index 20e25d20..53d237ef 100644
--- a/static/js/pandora/ui/findElement.js
+++ b/static/js/pandora/ui/findElement.js
@@ -27,16 +27,14 @@ pandora.ui.findElement = function() {
                 ] : [], [
                     app.$ui.findSelect = new Ox.Select({
                             id: 'select',
-                            items: $.merge($.merge([{
-                                id: 'all',
-                                title: 'Find: All'
-                            }], $.map(app.ui.findKeys, function(key, i) {
+                            items: $.merge($.map(app.ui.findKeys,
+                            function(key, i) {
                                 return {
                                     id: key.id,
                                     checked: key.id == findKey,
                                     title: 'Find: ' + key.title
                                 };
-                            })), [{}, {
+                            }), [{}, {
                                 id: 'advanced',
                                 title: 'Find: Advanced'
                             }]),