diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
index 86fc6f3..f2ed052 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
@@ -21,7 +21,8 @@ if (checkSession()) {
 	
 	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
 
-	if (isset($fForSearch)) {		
+	//if (isset($fForSearch)) {
+	if (strlen($fSearchString) > 0) {		
 		if (strlen($fSearchString) > 0) {
 			//display search results
 			$sMetaTagIDs = getChosenMetaDataTags();	
@@ -29,7 +30,13 @@ if (checkSession()) {
 			if (strlen($sMetaTagIDs) > 0) {
 				$sSQLSearchString = getSQLSearchString($fSearchString);
 				$sDocument = getApprovedDocumentString($sMetaTagIDs, $sSQLSearchString);
-				echo $sDocument;
+				$oPatternCustom = & new PatternCustom();
+				if (!isset($fStartIndex)) {
+					$fStartIndex = 0;
+				}
+				$oPatternCustom->setHtml(getSearchResults($sDocument,$fStartIndex, $fSearchString, $sMetaTagIDs));
+				$main->setCentralPayload($oPatternCustom);				                                
+				$main->render();
 				
 			} else {
 				$oPatternCustom = & new PatternCustom();
@@ -82,6 +89,10 @@ function getChosenMetaDataTags() {
 	return implode(",",$aTagIDs);
 }
 
+/**
+* Generate a string onsisting of all documents that match the search criteria
+* and that the user is allowed to see
+*/
 function getApprovedDocumentString($sMetaTagIDs, $sSQLSearchString) {
 	global $default;
 	$aApprovedDocumentIDs = array();
@@ -101,6 +112,10 @@ function getApprovedDocumentString($sMetaTagIDs, $sSQLSearchString) {
 	return implode(",",$aApprovedDocuments);	
 }
 
+/*
+* Generate a string that can be used in a SQL query
+* from the list of documents the user is allowed to see
+*/
 function getSQLSearchString($sSearchString) {
 	$aWords = explode(" ", $sSearchString);
 	$sSQLSearchString;
diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
index 76aa759..b5fc46c 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
@@ -21,7 +21,6 @@ function getMetaData($aMetaTagIDs) {
 	
 	while ($sql->next_record()) {
 		$sToRender .= "<tr><td><input type=\"checkbox\" " . wasSelected($sql->f("id"), $aMetaTagIDs) . " name=\"f_adv_" . $sql->f("name") . "\" value=\"" . $sql->f("id") . "\"></td><td>" . $sql->f("name") . "</td></tr>\n";		
-		
 	}
 	
 	$sToRender .= "<input type=\"hidden\" name=\"adv_search_end\" value=\"\" />\n";
@@ -35,7 +34,8 @@ function getSearchPage($sSearchString = "", $aMetaTagIDs = array()) {
 	$sToRender = "<table>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "<td>Search text: <input type=\"text\" size=\"60\" name=\"fSearchString\" value=\"$sSearchString\" /></td>\n";
-	$sToRender .= "<td><input type=\"image\" src=\"$default->graphicsUrl/search.gif\" /></td>\n";
+	//$sToRender .= "<td><input type=\"button\" src=\"$default->graphicsUrl/search.gif\" value=\"search\" onClick=\"validateAdvancedSearchText()\"/></td>\n";
+	$sToRender .= "<td><input type=\"button\" value=\"search\" onClick=\"validateAdvancedSearch()\"/></td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "<td>&nbsp</td>\n";
@@ -48,11 +48,40 @@ function getSearchPage($sSearchString = "", $aMetaTagIDs = array()) {
 	$sToRender .= "</tr>\n";	
 	$sToRender .= "</table>\n";
 	
-	return $sToRender;
+	return $sToRender . getSearchValidationJavaScript();;
 }
 
-function getSearchResults($sFolderIDs,$sSQLSearchString, $iStartIndex) {
+function getSearchResults($sSQLSearchString, $iStartIndex, $sSearchText, $sMetaTagIDs) {
+	global $default;	 
+	$sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id folder_id, D.id document_id, D.name AS document_name " .
+			"FROM $default->owl_documents_table AS D INNER JOIN $default->owl_folders_table AS F ON D.folder_id = F.id " .
+			"WHERE D.id IN ($sSQLSearchString)" .	
+			"ORDER BY D.name ASC";
+	
+	$aColumns = array("folder_image_url", "document_name");
+	$aColumnTypes = array(4,3);
+	$aColumnHeaders = array("","Document");
+	$aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument");
+	$aDBQueryStringColumns = array("document_id","folder_id");
+	$aQueryStringVariableNames = array("fDocumentID", "fFolderID");
+	
 	
+	$oPatternBrowse = & new PatternBrowseableSearchResults($sQuery, 2, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
+	$oPatternBrowse->setStartIndex($iStartIndex);
+	return $oPatternBrowse->render() . getSearchVariablesHtml($sSearchText, $sMetaTagIDs);
+}
+
+function getSearchValidationJavaScript() {
+	$sToRender = "\n\n<SCRIPT LANGUAGE=\"javascript\">\n ";
+	$sToRender .= "<!--\n";		
+	$sToRender .= "function validateAdvancedSearch() {\n";	
+	$sToRender .= "\tif (!(validRequired(document.MainForm.fSearchString, 'Search text'))) {\n";
+	$sToRender .= "\t\treturn;\n\t}\n";
+	$sToRender .= "\tdocument.MainForm.submit();\n}\n";
+	$sToRender .= "-->\n";
+	$sToRender .= "</SCRIPT>\n\n";
+	return $sToRender;
+
 }
 
 function wasSelected($iID, $aMetaTagIDs) {
@@ -62,5 +91,17 @@ function wasSelected($iID, $aMetaTagIDs) {
 	return "";
 }
 
+function getSearchVariablesHtml($sSearchText, $sMetaTagIDs) {
+	$aMetaTagIDs = explode(",", $sMetaTagIDs);
+	$sToRender = "\n\n<input type=\"hidden\" name=\"fSearchString\" value=\"$sSearchText\" />\n";
+	$sToRender .= "<input type=\"hidden\" name=\"adv_search_start\" value=\"\" />\n";
+	for ($i = 0; $i < count($aMetaTagIDs); $i++) {
+		$sToRender .= "<input type=\"hidden\" name=\"fMetaTag_$i\" value=\"" . $aMetaTagIDs[$i] . "\" />\n";
+		
+	}
+	$sToRender .= "<input type=\"hidden\" name=\"adv_search_end\" value=\"\" />\n";
+	return $sToRender;
+}
+
 ?>