diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
index 7793a5c..7de17c2 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
@@ -93,10 +93,12 @@ function getAdvancedSearchResults($aOrigReq, $iStartIndex) {
     $sSQLSearchString = join(" AND ", $aCritQueries);
     $sJoinSQL = join(" ", $aJoinSQL);
 
+    $sToSearch = KTUtil::arrayGet($aOrigReq, 'fToSearch', 'Live');
+
     $sQuery = DBUtil::compactQuery("
 SELECT
     F.name AS folder_name, F.id AS folder_id, D.id AS document_id,
-    D.name AS document_name, COUNT(D.id) AS doc_count
+    D.name AS document_name, D.filename AS file_name, COUNT(D.id) AS doc_count, 'View' AS view
 FROM
     $default->documents_table AS D
     INNER JOIN $default->folders_table AS F ON D.folder_id = F.id
@@ -113,16 +115,16 @@ ORDER BY doc_count DESC");
 
     $aParams = array();
     $aParams[] = $_SESSION["userID"];
-    $aParams[] = "Live";
+    $aParams[] = $sToSearch;
     $aParams = array_merge($aParams, $aCritParams);
 
     //var_dump(DBUtil::getResultArray(array($sQuery, $aParams)));
     //exit(0);
 
-    $aColumns = array("folder_name", "document_name", "doc_count");
-    $aColumnTypes = array(3,3,1);
-    $aColumnHeaders = array("<font color=\"ffffff\"><img src=$default->graphicsUrl/widgets/dfolder.gif>" . _("Folder") . "</font>","<font color=\"ffffff\">" . _("Document") . "</font>", "<font color=\"ffffff\">" . _("Matches") . "</font>");
-    $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument");
+    $aColumns = array("folder_name", "file_name", "document_name", "doc_count", "view");
+    $aColumnTypes = array(3,3,3,1,3);
+    $aColumnHeaders = array("<font color=\"ffffff\"><img src=$default->graphicsUrl/widgets/dfolder.gif>" . _("Folder") . "</font>", "<font color=\"ffffff\">" . _("Name") . "</font>", "<font color=\"ffffff\">" . _("Title") . "</font>", "<font color=\"ffffff\">" . _("Matches") . "</font>", "<font color=\"ffffff\">" . _("View") . "</font>");
+    $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument", "$default->rootUrl/control.php?action=viewDocument", null, "$default->rootUrl/control.php?action=downloadDocument");
     $aDBQueryStringColumns = array("document_id","folder_id");
     $aQueryStringVariableNames = array("fDocumentID", "fFolderID");
 
diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
index 0f08187..0fde806 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
@@ -104,46 +104,6 @@ function getSearchPage($sSearchString = "", $aMetaTagIDs = array(), $sHeading = 
 	return $sToRender . getSearchValidationJavaScript();
 }
 
-function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex, $sSearchString, $sStatus = "Live") {
-	global $default;
-
-    $aMetaTagIDs = split(',', $sMetaTagIDs);
-    $sQms = DBUtil::paramArray($aMetaTagIDs);
-					
-	/*ok*/ $sQuery = "SELECT  F.name as folder_name, F.id folder_id, D.id document_id, D.name AS document_name, COUNT(D.id) AS doc_count " .
-			"FROM $default->documents_table AS D INNER JOIN $default->folders_table AS F ON D.folder_id = F.id " .
-			"INNER JOIN $default->document_fields_link_table AS DFL ON DFL.document_id = D.id " .
-			"INNER JOIN $default->document_fields_table AS DF ON DF.id = DFL.document_field_id " . 
-			"INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.ID " .
-			"INNER JOIN $default->status_table AS SL on D.status_id=SL.id " .						
-			"WHERE DF.ID IN ($sQms) " .
-			"AND (" . $sSQLSearchString . ") " .
-			"AND (F.is_public " .
-			"OR SDUL.user_id = ?) " .
-			"AND SL.name = ? " .
-			"GROUP BY D.id " .
-			"ORDER BY doc_count DESC ";
-    $aParams = $aMetaTagIDs;
-    $aParams[] = $_SESSION["userID"];
-    $aParams[] = $sStatus;
-
-	$default->log->info("getSearchResults $sQuery");
-
- 	$aColumns = array("folder_name", "document_name", "doc_count");
- 	$aColumnTypes = array(3,3,1);
-	$aColumnHeaders = array("<font color=\"ffffff\"><img src=$default->graphicsUrl/widgets/dfolder.gif>" . _("Folder") . "</font>","<font color=\"ffffff\">" . _("Document") . "</font>", "<font color=\"ffffff\">" . _("Matches") . "</font>");
-	$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(array($sQuery, $aParams), 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
-	$oPatternBrowse->setStartIndex($iStartIndex);
-	$oPatternBrowse->setSearchText($sSearchString);
-    
-    $sRefreshMessage = "<table><tr><td align=\"center\">" . _("If your browser displays a 'Warning: Page has Expired' message when you attempt to return to these search results, please click your browser's 'Refresh' button") . "</td></tr></table>";
-	return renderHeading(_("Advanced Search")) . $oPatternBrowse->render() . $sRefreshMessage . getSearchVariablesHtml($sSearchString, $sStatus, $sMetaTagIDs);
-}
-
 function getSearchValidationJavaScript() {
 	/*$sToRender = "\n\n<SCRIPT LANGUAGE=\"javascript\">\n ";
 	$sToRender .= "<!--\n";