diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
index e5cc1755e7..d26b416ab1 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
@@ -77,7 +77,7 @@
                         <td>
    <#if d.properties.categories?exists>
       <#list d.properties.categories as category>
-                           ${companyhome.nodeByReference[category].name};
+                           ${category.name}<#if category != d.properties.categories?last>,</#if>
       </#list>
    <#else>
                            None.
@@ -115,7 +115,7 @@
          <form id="addTagForm" action="#" onsubmit="return OfficeDocDetails.addTag('${d.id}', this.tag.value);">
             <fieldset class="addTagFieldset">
                <input id="addTagBox" name="tag" type="text" />
-               <input class="addTagImage" type="image" src="${url.context}/images/office/action_successful.gif" onclick="return (document.addTagForm.tag.value.length > 0);" />
+               <input class="addTagImage" type="image" src="${url.context}/images/office/action_successful.gif" onclick="return ($('addTagBox').value.length > 0);" />
                <input class="addTagImage" type="image" src="${url.context}/images/office/action_failed.gif" onclick="return OfficeDocDetails.hideAddTagForm();" />
             </fieldset>
          </form>
diff --git a/source/web/scripts/office/doc_details.js b/source/web/scripts/office/doc_details.js
index 5c3202ed8f..615e68f50f 100644
--- a/source/web/scripts/office/doc_details.js
+++ b/source/web/scripts/office/doc_details.js
@@ -43,15 +43,7 @@ var OfficeDocDetails =
    
    setupTags: function()
    {
-      var tags = $$('#panelTags .tagName');
-      
-      tags.each(function(tag, i)
-      {
-         tag.addEvent('click', function(e)
-         {
-            window.location.href = window.serviceContextPath + "/office/tags?p=" + window.queryObject.p + "&tag=" + encodeURI(tag.innerHTML);
-         });
-      });
+      // Placeholder
    },
 
    showAddTagForm: function()