diff --git a/static/js/pandora/ui/infoView.js b/static/js/pandora/ui/infoView.js
index f4401cca6..89d519d88 100644
--- a/static/js/pandora/ui/infoView.js
+++ b/static/js/pandora/ui/infoView.js
@@ -193,15 +193,15 @@ pandora.ui.infoView = function(data) {
         )
         .appendTo($text);
 
-    // fixme: creator seems to be always missing
-    if (data.creator || data.writer || data.producer || data.cinematographer || data.editor) {
+    // fixme: episodeDirector seems to be always missing
+    if (data.episodeDirector || data.writer || data.producer || data.cinematographer || data.editor) {
         $div = $('<div>')
             .css(css)
             .appendTo($text);
         html = [];
-        ['creator', 'writer', 'producer', 'cinematographer', 'editor'].forEach(function(key) {
+        ['episode_director', 'writer', 'producer', 'cinematographer', 'editor'].forEach(function(key) {
             data[key] && html.push(
-                formatKey(key) + formatValue(data[key], 'name')
+                formatKey(key == 'episodeDirector' ? 'director' : key) + formatValue(data[key], 'name')
             );
         });
         $div.html(html.join('; '));
diff --git a/static/js/pandora/ui/list.js b/static/js/pandora/ui/list.js
index 7c0895927..4f9ecb935 100644
--- a/static/js/pandora/ui/list.js
+++ b/static/js/pandora/ui/list.js
@@ -248,7 +248,7 @@ pandora.ui.list = function() {
             });
     }
 
-    if (['list', 'grid'].indexOf(view) > -1) {
+    if (['list', 'grid', 'timelines'].indexOf(view) > -1) {
 
         pandora.enableDragAndDrop(that, true);