diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentUI.inc
index 22c6377..f54b2df 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentUI.inc
@@ -10,7 +10,7 @@
 
 function getDocumentListForFolder($fFolderID) {
 	global $default;
-	$sQuery = "SELECT D.id, D.folder_id, D.name, COALESCE(MT.icon_path, '$default->owl_graphics_url/star.gif') AS image_url " . 
+	$sQuery = "SELECT D.id AS  id, D.folder_id AS folder_id, D.name, COALESCE(MT.icon_path, '$default->owl_graphics_url/star.gif') AS image_url " . 
 			"FROM $default->owl_documents_table AS D LEFT OUTER JOIN $default->owl_mime_table AS MT ON D.mime_id = MT.id " .
 			"WHERE folder_id = $fFolderID " .
 			"ORDER BY name ASC";
@@ -18,8 +18,9 @@ function getDocumentListForFolder($fFolderID) {
 	$aColumns = array("name");
 	$aColumnTypes = array(3);
 	$aColumnHeaderNames = ("Name");
-	
-	$oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", "$default->owl_root_url/control.php?action=viewDocument&fDocumentID=", "id");
+	$aDBColumns = array("id");
+	$aQueryStringVariableNames = array("fDocumentID");	
+	$oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", "$default->owl_root_url/control.php?action=viewDocument", $aDBColumns, $aQueryStringVariableNames);
 	$oPatternTableSqlQuery->setEmptyTableMessage("This folder contains no documents");
 	$oPatternTableSqlQuery->setUseImageURLFromQuery(true);
 	return $oPatternTableSqlQuery->render();
@@ -64,7 +65,7 @@ function getBrowseAddPage($fFolderID) {
 	$sToRender .= "<td colspan=\"2\"><b>Document to add:<b></td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<td><input type=\"file\" name=\"fFile\"></td>\n";
-	$sToRender .= "<td><input type=\"submit\" value=\"Add\"></td>\n";
+	$sToRender .= "<td><input type=\"image\" value=\"Add\"></td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "</table>\n";