diff --git a/static/js/pandora/infoView.padma.js b/static/js/pandora/infoView.padma.js
index 44014c1b..c30f101a 100644
--- a/static/js/pandora/infoView.padma.js
+++ b/static/js/pandora/infoView.padma.js
@@ -158,14 +158,7 @@ pandora.ui.infoView = function(data) {
             Ox.EditableContent({
                     clickLink: pandora.clickLink,
                     format: function(value) {
-                        // FIXME: what??
-                        return listKeys.indexOf(key) >= 0
-                            ? formatValue(value.split(', '), {
-                                'director': 'name',
-                                'cinematographer': 'name',
-                                'features': 'name',
-                            }[key] || key)
-                            : value;
+                        return formatValue(value, key);
                     },
                     placeholder: formatLight(Ox._('unknown')),
                     editable: canEdit,
@@ -475,9 +468,14 @@ pandora.ui.infoView = function(data) {
             ret = value ? Ox.formatDate(value,
                 ['', '%Y', '%B %Y', '%B %e, %Y'][value.split('-').length]
             ) : '';
+        } else if (listKeys.indexOf(key) > -1) {
+            ret = value.split(', ');
         } else {
             ret = value;
         }
+        if (nameKeys.indexOf(key) > -1) {
+            key = 'name';
+        }
         return formatLink(ret, key);
     }