diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
index ab2683a..817e326 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
@@ -36,12 +36,14 @@ if (checkSession()) {
 					if (!isset($fStartIndex)) {
 						$fStartIndex = 0;
 					}
-					$oPatternCustom->setHtml(getSearchResults($sDocument,$fStartIndex, $fSearchString, $sMetaTagIDs));
+					//$oPatternCustom->setHtml(getSearchResults($sDocument,$fStartIndex, $fSearchString, $sMetaTagIDs));					
+					$oPatternCustom->setHtml(getSearchResults($sMetaTagIDs,$sSQLSearchString, $fStartIndex));					
 					$main->setCentralPayload($oPatternCustom);				                                
 					$main->render();
 				} else {
-					$oPatternCustom = & new PatternCustom();
+					$oPatternCustom = & new PatternCustom();					
 					$oPatternCustom->setHtml(getSearchPage($fSearchString, explode(",",$sMetaTagIDs)));
+					//$oPatternCustom->setHtml(getSearchResults($sMetaTagIDs,$sSQLSearchString, $fStartIndex));
 					$main->setCentralPayload($oPatternCustom);
 					$main->setErrorMessage("No documents matched your search criteria");
 					$main->setFormAction("advancedSearchBL.php?fForSearch=1");                                
diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
index 7d4c47c..a1550fe 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
@@ -71,16 +71,26 @@ function getSearchPage($sSearchString = "", $aMetaTagIDs = array()) {
 	return $sToRender . getSearchValidationJavaScript();;
 }
 
-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 " .
+//function getSearchResults($sSQLSearchString, $iStartIndex, $sSearchText, $sMetaTagIDs) {
+function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex) {
+	global $default;	
+	$sQuery = "SELECT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id folder_id, D.id document_id, D.name AS document_name, COUNT(D.id) AS doc_count " .
 			"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("<font color=\"ffffff\">Folder</font>","<font color=\"ffffff\">Document</font>");
+			"INNER JOIN document_fields_link AS DFL ON DFL.document_id = D.id " .
+			"INNER JOIN document_fields AS DF ON DF.id = DFL.document_field_id " . 
+			"INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.ID " .			
+			//"WHERE D.id IN ($sSQLSearchString) " .
+			"WHERE DF.ID IN ($sMetaTagIDs) " .
+			"AND " . $sSQLSearchString . " " .
+			"AND SDUL.user_id = " . $_SESSION["userID"] . " " .
+			"GROUP BY D.id ";
+			"ORDER BY doc_count DESC ";
+			
+	//echo $sQuery;	
+		
+	$aColumns = array("folder_image_url", "document_name", "doc_count");
+	$aColumnTypes = array(4,3,3);
+	$aColumnHeaders = array("<font color=\"ffffff\">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");