diff --git a/static/js/infoView.js b/static/js/infoView.js
index 274401e57..a23f81bb5 100644
--- a/static/js/infoView.js
+++ b/static/js/infoView.js
@@ -425,12 +425,12 @@ pandora.ui.infoView = function(data) {
 
     function formatValue(key, value) {
         var ret;
-        if (key == 'year') {
-            ret = formatLink(value, 'year');
-        } else if (nameKeys.indexOf(key) > -1) {
+        if (nameKeys.indexOf(key) > -1) {
             ret = formatLink(value.split(', '), 'name');
         } else if (listKeys.indexOf(key) > -1) {
             ret = formatLink(value.split(', '), key);
+        } else if (['year', 'country'].indexOf(key) > -1) {
+            ret = formatLink(value, key);
         } else {
             ret = value;
         }