diff --git a/static/js/documentInfoView.amp.js b/static/js/documentInfoView.amp.js
index 07f5d89..a9ff5f3 100644
--- a/static/js/documentInfoView.amp.js
+++ b/static/js/documentInfoView.amp.js
@@ -23,11 +23,14 @@ pandora.ui.documentInfoView = function(data, isMixed) {
         }).map(function(key) {
             return key.id;
         }),
-        listKeys = pandora.site.documentKeys.filter(function(key) {
+        listKeys = [
+            "group",
+            "source"
+        ].concat(pandora.site.documentKeys.filter(function(key) {
             return Ox.isArray(key.type);
         }).map(function(key){
             return key.id;
-        }),
+        })),
         statisticsWidth = 128,
 
         $bar = Ox.Bar({size: 16})
@@ -227,7 +230,7 @@ pandora.ui.documentInfoView = function(data, isMixed) {
                     conditions: [{
                         key: 'type', operator: '==', value: Ox.decodeHTMLEntities(key)
                     }, {
-                        key: 'name', operator: '==', value: Ox.decodeHTMLEntities(data[key] || '')
+                        key: 'name', operator: '==', value: Ox.encodeHTMLEntities(Ox.decodeHTMLEntities(data[key] || ''))
                     }],
                     operator: '&'
                 },