diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataBL.php
index 0e41c0c..f4002eb 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataBL.php
@@ -38,12 +38,12 @@ if (checkSession()) {
         if($fMetaDataName != "") {
             $oMetaData = new MetaData($fDocFieldID,$fMetaDataName);
             if($oMetaData->create()) {
-                $oPatternCustom->setHtml(getSuccessPage());
+                $oPatternCustom->setHtml(getSuccessPage($fDocFieldID));
             } else {
-                $oPatternCustom->setHtml(getFailPage());
+                $oPatternCustom->setHtml(getFailPage($fDocFieldID));
             }
         } else {
-            $oPatternCustom->setHtml(getTextPage());
+            $oPatternCustom->setHtml(getTextPage($fDocFieldID));
         }
     }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc
index cbc26a3..12b971d 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc
@@ -65,7 +65,7 @@ function getAddMetaDataPage($iDocFieldID) {
 
 
 // if edition is successful print otu success page
-function getSuccessPage() {
+function getSuccessPage($iDocFieldID = null) {
     global $default;
 
     $sToRender .= renderHeading("Add Document Field Lookup");
@@ -75,7 +75,7 @@ function getSuccessPage() {
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
+    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table>\n";
 
@@ -83,7 +83,7 @@ function getSuccessPage() {
 }
 
 // if edition is successful print otu success page
-function getFailPage() {
+function getFailPage($iDocFieldID = null) {
     global $default;
 
     $sToRender .= renderHeading("Add Document Field Lookup");
@@ -93,7 +93,7 @@ function getFailPage() {
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
+    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table>\n";
 
@@ -102,7 +102,7 @@ function getFailPage() {
 
 
 // if edition is successful print otu success page
-function getTextPage() {
+function getTextPage($iDocFieldID = null) {
     global $default;
 
     $sToRender .= renderHeading("Add Document Field Lookup");
@@ -112,7 +112,7 @@ function getTextPage() {
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
+    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table>\n";
 
@@ -136,7 +136,7 @@ function getCancelButton($oDocField) {
         return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
     }
     else {
-        return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
+        return "<td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=" . $oDocField->getId() . " \"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
     }
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
index 47abda9..85b9c67 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
@@ -45,12 +45,12 @@ if (checkSession()) {
             $oMetaData = new MetaData($fDocFieldID,$fMetaDataName);
             $oMetaData->setMetaDataID($fDocFieldID,$fOldMetaDataName);
             if($oMetaData->update()) {
-                $oPatternCustom->setHtml(getSuccessPage());
+                $oPatternCustom->setHtml(getSuccessPage($fDocFieldID));
             } else {
-                $oPatternCustom->setHtml(getFailPage());
+                $oPatternCustom->setHtml(getFailPage($fDocFieldID));
             }
         } else {
-            $oPatternCustom->setHtml(getTextPage());
+            $oPatternCustom->setHtml(getTextPage($fDocFieldID));
         }
     }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
index 12d0e14..16f9c04 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
@@ -115,7 +115,7 @@ function getEditMetaDataPage($iDocFieldID, $iMetaDataID) {
 }
 
 // if edition is successful print otu success page
-function getSuccessPage() {
+function getSuccessPage($iDocFieldID = null) {
     global $default;
 
     $sToRender .= renderHeading("Edit Document Field Lookup");
@@ -125,7 +125,7 @@ function getSuccessPage() {
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
+    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table>\n";
 
@@ -133,7 +133,7 @@ function getSuccessPage() {
 }
 
 // if edition is successful print otu success page
-function getFailPage() {
+function getFailPage($iDocFieldID = null) {
     global $default;
 
     $sToRender .= renderHeading("Edit Document Field Lookup");
@@ -143,7 +143,7 @@ function getFailPage() {
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
+    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table>\n";
 
@@ -152,7 +152,7 @@ function getFailPage() {
 
 
 // if edition is successful print otu success page
-function getTextPage() {
+function getTextPage($iDocFieldID = null) {
     global $default;
 
     $sToRender .= renderHeading("Edit Document Field Lookup");
@@ -162,7 +162,7 @@ function getTextPage() {
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr></tr>\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
+    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "</table>\n";
 
@@ -186,7 +186,7 @@ function getCancelButton($oDocField) {
         return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
     }
     else {
-        return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
+        return "<td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=" . $oDocField->getId() . "\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
     }
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataBL.php
index 09a59d3..1a734ac 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataBL.php
@@ -43,9 +43,9 @@ if (checkSession()) {
         $oMetaData = new MetaData($fDocFieldID,$fMetaDataName);
         $oMetaData->setMetaDataID($fDocFieldID,$fMetaDataName);
         if($oMetaData->delete()) {
-            $oPatternCustom->setHtml(getSuccessPage());
+            $oPatternCustom->setHtml(getSuccessPage($fDocFieldID));
         } else {
-            $oPatternCustom->setHtml(getFailPage());
+            $oPatternCustom->setHtml(getFailPage($fDocFieldID));
         }
     }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc
index c8a60f0..4d8ba9c 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc
@@ -93,7 +93,7 @@ function getDeleteConfirmedPage($iDocFieldID, $iMetaDataID) {
 }
 
 // if edition is successful print otu success page
-function getSuccessPage() {	
+function getSuccessPage($iDocFieldID = null) {	
 	global $default;
 			
     $sToRender .= renderHeading("Remove Document Field Lookup");
@@ -103,7 +103,7 @@ function getSuccessPage() {
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
+	$sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "</table>\n";
 	
@@ -111,7 +111,7 @@ function getSuccessPage() {
 }
 
 // if edition is successful print otu success page
-function getFailPage() {	
+function getFailPage($iDocFieldID = null) {	
 	global $default;
 			
     $sToRender .= renderHeading("Remove Document Field Lookup");
@@ -121,7 +121,7 @@ function getFailPage() {
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
+	$sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "</table>\n";
 	
@@ -144,7 +144,7 @@ function getCancelButton($oDocField) {
 	if (!isset($oDocField)) {
 		return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border = \"0\"/></a></td>\n";
 	} else {
-		return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
+		return "<td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=" . $oDocField->getId() . "\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
 	}
 }