diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc
index a71321c..1db5b4d 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc
@@ -159,7 +159,7 @@ function renderPage($aResults, $sBrowseType) {
     $sToRender .=  "<table border=\"1\" width=\"100%\">\n";
 	$sToRender .= "\t<tr><td>";    
     switch ($sBrowseType) {
-        case "folder"       : $sToRender .= displayFolderPathLink(Folder::getFolderPathAsArray($aResults["folders"][0]->getID())); break;
+        case "folder"       : $sToRender .= displayFolderPathLink(Folder::getFolderPathAsArray($aResults["folders"][0]->getID()), Folder::getFolderPathNamesAsArray($aResults["folders"][0]->getID())); break;
         case "category"     : $sToRender .= displayCategoryPathLink($aResults["categories"]); break;
         case "documentType" : $sToRender .= displayDocumentTypePathLink($aResults["documentTypes"]); break;
     }
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc
index 319dd10..33db82b 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc
@@ -11,7 +11,7 @@
 
 function getDocumentPath($iFolderID, $sDocumentName) {
 	global $default;
-	$sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse") . " > " . $sDocumentName;
+	$sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID),  Folder::getFullFolderPath($iFolderID), "$default->owl_root_url/control.php?action=browse") . " > " . $sDocumentName;
 	return "<table border=1 width = 100%><tr><td>$sDocumentPath</td></tr></table>\n";	
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
index 36fa459..7bc40c8 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
@@ -10,7 +10,7 @@
 
 function getDocumentPath($oDocument) {
 	global $default;
-	$sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), "$default->owl_root_url/control.php?action=browse") . " > " . $oDocument->getName();
+	$sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID(()) "$default->owl_root_url/control.php?action=browse") . " > " . $oDocument->getName();
 	return "<table border=1 width = 100%><tr><td>$sDocumentPath</td></tr></table>\n";	
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc
index 896595e..91c8e3f 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc
@@ -10,7 +10,7 @@
 */
 
 function renderDocumentPath($oDocument) {
-    $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID())) . " > " . $oDocument->getName();
+    $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID())) . " > " . $oDocument->getName();
     return "<table border=1 width = 100%><tr><td>$sDocumentPath</td></tr></table>\n";
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc
index 1f9033a..7caff9f 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc
@@ -2,7 +2,7 @@
 
 function getFolderPath($iFolderID) {
     global $default;
-    $sFolderPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse");
+    $sFolderPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID),  "$default->owl_root_url/control.php?action=browse");
     return "<table border=1 width = 100%><tr><td>$sFolderPath</td></tr></table>\n";
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc
index 8ab4b64..8d19484 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc
@@ -11,7 +11,7 @@
 
 function getDocumentPath($iFolderID, $sDocumentName) {
     global $default;
-    $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse") . " > " . $sDocumentName;
+    $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID),  "$default->owl_root_url/control.php?action=browse") . " > " . $sDocumentName;
     return "<table border=1 width = 100%><tr><td>$sDocumentPath</td></tr></table>\n";
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php
index 55ca2e1..e279650 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php
@@ -28,7 +28,7 @@ if (checkSession()) {
 
         if (!isset($fFolderName)) {
             require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
-            //we're still browsing
+            //we're still browsing			
             if (Permission::userHasFolderWritePermission($fFolderID)) {
                 //if the user is allowed to add folders, then display the add button
                 $oPatternCustom->setHtml(renderBrowseAddPage($fFolderID));
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc
index 84a1a36..4ef34b7 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc
@@ -42,7 +42,7 @@ function getPage($iFolderID, $iGroupID, $iRoleID, $iSequenceNumber) {
 
 function getFolderPath($iFolderID) {
 	global $default;
-	return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse");		
+	return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID),  "$default->owl_root_url/control.php?action=browse");		
 }
 
 function getGroupDropDown($iGroupID) {
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc
index 9730c20..83c6b06 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc
@@ -10,7 +10,7 @@
 
 function getFolderPath($iFolderID) {
 	global $default;
-	return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse");		
+	return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID),  "$default->owl_root_url/control.php?action=browse");		
 }
 
 function getFolderCollaborationData($iFolderCollaborationID) {
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc
index 371f7dd..767d5f4 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc
@@ -38,7 +38,7 @@ function getPage($iFolderID, $iGroupID, $iRoleID, $iSequenceNumber) {
 
 function getFolderPath($iFolderID) {
 	global $default;
-	return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse");		
+	return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID),  "$default->owl_root_url/control.php?action=browse");		
 }
 
 
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc
index 02db49b..54624b3 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc
@@ -12,7 +12,7 @@
 
 function getFolderPath($iFolderID) {
 	global $default;
-	$sFolderPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse");
+	$sFolderPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID),  "$default->owl_root_url/control.php?action=browse");
 	return "<table border=1 width = 100%><tr><td>$sFolderPath</td></tr></table>\n";	
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
index a77bdd0..7ef0395 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
@@ -10,7 +10,7 @@
 
 function getFolderPath($iFolderID) {
 	global $default;
-	return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse");		
+	return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID),  "$default->owl_root_url/control.php?action=browse");		
 }
 
 
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
index 1c2ac06..22004b5 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
@@ -19,7 +19,7 @@
  * @param array containing the path to the folder (folder ids)
  * @param string the page to link to (defaults to the page this is called from)
  */
-function displayFolderPathLink($aPathArray, $sLinkPage = "") {
+function displayFolderPathLink($aPathArray, $aPathNameArray, $sLinkPage = "") {
     global $default;
     if (strlen($sLinkPage) == 0) {
         $sLinkPage = $_SERVER["PHP_SELF"];
@@ -27,9 +27,10 @@ function displayFolderPathLink($aPathArray, $sLinkPage = "") {
     $default->log->debug("displayFolderPathLink: slinkPage=$sLinkPage");
     // display a separate link to each folder in the path
     for ($i=0; $i<count($aPathArray); $i++) {
-        $iFolderID = $aPathArray[$i];
+        $iFolderID = $aPathArray[$i];		
         // retrieve the folder name for this folder
-        $sFolderName = Folder::getFolderName($iFolderID);
+        //$sFolderName = Folder::getFolderName($iFolderID);
+		$sFolderName = $aPathNameArray[$i];
         // generate a link back to this page setting fFolderID
         $sLink = generateLink($sLinkPage,
                               "fBrowseType=folder&fFolderID=$iFolderID",
@@ -60,8 +61,8 @@ function displayFolderLink($oFolder, $sLinkPage = "") {
                         $oFolder->getName());
 }
 
-function renderFolderPath($fFolderID, $sLinkURL) {
-    $sFolderPath = displayFolderPathLink(Folder::getFolderPathAsArray($fFolderID, $sLinkURL));
+function renderFolderPath($iFolderID, $sLinkURL) {	 
+    $sFolderPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID), $sLinkURL);
     return "<table border=1 width = 100%><tr><td>$sFolderPath</td></tr></table>\n";
 }