diff --git a/lib/visualpatterns/PatternBrowsableSearchResults.inc b/lib/visualpatterns/PatternBrowsableSearchResults.inc
index 4dad6bb..0d760d1 100644
--- a/lib/visualpatterns/PatternBrowsableSearchResults.inc
+++ b/lib/visualpatterns/PatternBrowsableSearchResults.inc
@@ -62,111 +62,121 @@ class PatternBrowseableSearchResults {
 		$sLimitQuery = $this->sQuery . " LIMIT " . $this->iStartIndex . ", " . $this->iResultsToDisplay;
 		$sql = & $default->db;		
 		$sql->query($sLimitQuery);
+		$sToRender;
+		if ($sql->num_rows() == 0) {
+			//no results
+			$sToRender = "<table width=\"100%\" height=\"100%\">\n";		
+			$sToRender .= "<tr>\n";		
+			$sToRender .= "<td><p class=\"errorText\">No results matched your criteria</p></td>\n";
+			$sToRender .= "</tr>\n";
+			$sToRender .= "</table>\n";
+		} else {
         
-		$sToRender = "<table width=\"100%\" height=\"100%\">\n";		
-		$sToRender .= "<tr>\n";		
-		for ($i = 0; $i < count($this->aColumnHeadings); $i++) {
-			if (! (strcmp($this->sOrderByColumn, $this->aColumns[$i]) === false) && (strcmp($this->sOrderByColumn, $this->aColumns[$i]) == 0)) {
-				if (!(strcmp($this->sOrderDirection,"ASC") === false) && (strcmp($this->sOrderDirection,"ASC") == 0)) {					
-					//$sToRender .= "<th align=\"left\"><a href=\"" . $_SERVER["PHP_SELF"] . "?fOrderBy=" . $this->aColumns[$i] . "&fOrderDirection=DESC&fStartIndex=" . $this->iStartIndex . "\">" . $this->aColumnHeadings[$i]."</a></th>\n";
-					$sToRender .= "<th align=\"left\">" . $this->aColumnHeadings[$i]. "</th>\n";
+			$sToRender = "<table width=\"100%\" height=\"100%\">\n";		
+			$sToRender .= "<tr>\n";		
+			for ($i = 0; $i < count($this->aColumnHeadings); $i++) {
+				if (! (strcmp($this->sOrderByColumn, $this->aColumns[$i]) === false) && (strcmp($this->sOrderByColumn, $this->aColumns[$i]) == 0)) {
+					if (!(strcmp($this->sOrderDirection,"ASC") === false) && (strcmp($this->sOrderDirection,"ASC") == 0)) {					
+						//$sToRender .= "<th align=\"left\"><a href=\"" . $_SERVER["PHP_SELF"] . "?fOrderBy=" . $this->aColumns[$i] . "&fOrderDirection=DESC&fStartIndex=" . $this->iStartIndex . "\">" . $this->aColumnHeadings[$i]."</a></th>\n";
+						$sToRender .= "<th align=\"left\">" . $this->aColumnHeadings[$i]. "</th>\n";
+					} else {
+						//$sToRender .= "<th align=\"left\"><a href=\"" . $_SERVER["PHP_SELF"] . "?fOrderBy=" . $this->aColumns[$i] . "&fOrderDirection=ASC&fStartIndex=" . $this->iStartIndex . "\">" . $this->aColumnHeadings[$i]."</a></th>\n";
+						$sToRender .= "<th align=\"left\">" . $this->aColumnHeadings[$i]. "</th>\n";
+					}
 				} else {
 					//$sToRender .= "<th align=\"left\"><a href=\"" . $_SERVER["PHP_SELF"] . "?fOrderBy=" . $this->aColumns[$i] . "&fOrderDirection=ASC&fStartIndex=" . $this->iStartIndex . "\">" . $this->aColumnHeadings[$i]."</a></th>\n";
 					$sToRender .= "<th align=\"left\">" . $this->aColumnHeadings[$i]. "</th>\n";
 				}
-			} else {
-				//$sToRender .= "<th align=\"left\"><a href=\"" . $_SERVER["PHP_SELF"] . "?fOrderBy=" . $this->aColumns[$i] . "&fOrderDirection=ASC&fStartIndex=" . $this->iStartIndex . "\">" . $this->aColumnHeadings[$i]."</a></th>\n";
-				$sToRender .= "<th align=\"left\">" . $this->aColumnHeadings[$i]. "</th>\n";
 			}
-		}
-		$sToRender .= "</tr>\n";		
+			$sToRender .= "</tr>\n";		
+					
+			$iDisplayed = 0;
+			//limit the result set displayed		
+			while($sql->next_record() && ($iDisplayed < $this->iResultsToDisplay)) {
+				$sToRender .= "<tr>";
 				
-		$iDisplayed = 0;
-		//limit the result set displayed		
-		while($sql->next_record() && ($iDisplayed < $this->iResultsToDisplay)) {
-			$sToRender .= "<tr>";
-			
-			for ($i = 0; $i < count($this->aColumns); $i++) {
-				switch ($this->aColumnTypes[$i]) {
-					case 1:							
-						//display text
-						$sToRender .= "<td>" . $sql->f($this->aColumns[$i]) . "</td>\n";					
-					break;
-					case 2:
-						//diplay a checkbox
-						$sToRender .= "<td>" . ($sql->f($this->aColumns[$i]) ? "Yes" : "No") . "</td>\n";						
-						break;
-					case 3:					
-						//display a url
-						$sToRender .= "<td><a href=\"" . $this->aLinkURLs[$i];
-						for ($j = 0; $j < count($this->aDBQueryStringColumns); $j++) {
-							if (strpos($sToRender, "?") === false) {
-								$sToRender .= "?" . $this->aQueryStringVariableNames[$j] . "=" . $sql->f($this->aDBQueryStringColumns[$j]);										
-							} else { 
-								$sToRender .= "&" . $this->aQueryStringVariableNames[$j] . "=" . $sql->f($this->aDBQueryStringColumns[$j]);
-							}									
-						}
-						$sToRender .= "\">" . $sql->f($this->aColumns[$i]) . "</a></td>\n";
-						break;
-					case 4:
-						//diplay an image URL
-						$sToRender .= "<td><a href=\"" . $this->aLinkURLs[$i];
-						for ($j = 0; $j < count($this->aDBQueryStringColumns); $j++) {
-							if (strpos($sToRender, "?") === false) {
-								$sToRender .= "?" . $this->aQueryStringVariableNames[$j] . "=" . $sql->f($this->aDBQueryStringColumns[$j]);										
-							} else { 
-								$sToRender .= "&" . $this->aQueryStringVariableNames[$j] . "=" . $sql->f($this->aDBQueryStringColumns[$j]);
-							}									
-						}						
-						$sToRender .= "\"><img src=\"" . $sql->f($this->aColumns[$i]) . "\" border=\"0\" /></a></td>\n";						
-						break;
-					default:
+				for ($i = 0; $i < count($this->aColumns); $i++) {
+					switch ($this->aColumnTypes[$i]) {
+						case 1:							
+							//display text
+							$sToRender .= "<td>" . $sql->f($this->aColumns[$i]) . "</td>\n";					
 						break;
+						case 2:
+							//diplay a checkbox
+							$sToRender .= "<td>" . ($sql->f($this->aColumns[$i]) ? "Yes" : "No") . "</td>\n";						
+							break;
+						case 3:					
+							//display a url
+							$sToRender .= "<td><a href=\"" . $this->aLinkURLs[$i];
+							for ($j = 0; $j < count($this->aDBQueryStringColumns); $j++) {
+								if (strpos($sToRender, "?") === false) {
+									$sToRender .= "?" . $this->aQueryStringVariableNames[$j] . "=" . $sql->f($this->aDBQueryStringColumns[$j]);										
+								} else { 
+									$sToRender .= "&" . $this->aQueryStringVariableNames[$j] . "=" . $sql->f($this->aDBQueryStringColumns[$j]);
+								}									
+							}
+							$sToRender .= "\">" . $sql->f($this->aColumns[$i]) . "</a></td>\n";
+							break;
+						case 4:
+							//diplay an image URL
+							$sToRender .= "<td><a href=\"" . $this->aLinkURLs[$i];
+							for ($j = 0; $j < count($this->aDBQueryStringColumns); $j++) {
+								if (strpos($sToRender, "?") === false) {
+									$sToRender .= "?" . $this->aQueryStringVariableNames[$j] . "=" . $sql->f($this->aDBQueryStringColumns[$j]);										
+								} else { 
+									$sToRender .= "&" . $this->aQueryStringVariableNames[$j] . "=" . $sql->f($this->aDBQueryStringColumns[$j]);
+								}									
+							}						
+							$sToRender .= "\"><img src=\"" . $sql->f($this->aColumns[$i]) . "\" border=\"0\" /></a></td>\n";						
+							break;
+						default:
+							break;
+					}
 				}
+				$sToRender .= "</tr>\n";
+				$iDisplayed++;
 			}
-			$sToRender .= "</tr>\n";
-			$iDisplayed++;
-		}
-		
-		//if we displayed less results than the number to display
-		//simply pad the table
-		while ($iDisplayed < $this->iResultsToDisplay) {
-			$sToRender .= "<tr><td>&nbsp</td></tr>\n";
-			$iDisplayed++;
-		}
-		
-		$sToRender .= "<tr>\n";		
-		
-		$sToRender .= "<input type=\"hidden\" name=\"fStartIndex\" value=\"" . ($this->iStartIndex +  $this->iResultsToDisplay) . "\" />\n";
-		/* Display only the next button */
-		if (($this->iStartIndex + $this->iResultsToDisplay) < $this->getResultCount($sql) && $this->iStartIndex == 0) {
-			$sToRender .= "<td>";
-			//$sToRender .= ("<a href=\"" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex +  $this->iResultsToDisplay) . "\">Next</a>");
-			$sToRender .= ("<input type=\"image\" src=\"$default->graphicsUrl/widgets/next.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex +  $this->iResultsToDisplay) . "')\" />");
-			$sToRender .= "</td>\n";
-		}
-		/* Display both the next and the previous buttons */		
-		else if (($this->iStartIndex + $this->iResultsToDisplay) < $this->getResultCount($sql) && $this->iStartIndex > 0) {
-			$sToRender .= "<td>";
-			$sToRender .= ("<input type=\"image\" src=\"$default->graphicsUrl/widgets/next.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex +  $this->iResultsToDisplay) . "')\" />");
-			$sToRender .= "</td>";
-			$sToRender .= "<td>";
-			$sToRender .= ("<input type=\"image\" src=\"$default->graphicsUrl/widgets/previous.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex -  $this->iResultsToDisplay) . "')\" />");
-			$sToRender .= "</td>\n";
 			
-		}	
-		/* Display only the previous button */
-		else if ($this->iStartIndex > 0) {
-			$sToRender .= "<td>\n";
-			$sToRender .= ("&nbsp");
-			$sToRender .= "</td>";
-			$sToRender .= "<td>\n";
-			$sToRender .= ("<input type=\"image\" src=\"$default->graphicsUrl/widgets/previous.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex -  $this->iResultsToDisplay) . "')\" />");
-			$sToRender .= "</td>";
+			//if we displayed less results than the number to display
+			//simply pad the table
+			while ($iDisplayed < $this->iResultsToDisplay) {
+				$sToRender .= "<tr><td>&nbsp</td></tr>\n";
+				$iDisplayed++;
+			}
+			
+			$sToRender .= "<tr>\n";		
+			
+			$sToRender .= "<input type=\"hidden\" name=\"fStartIndex\" value=\"" . ($this->iStartIndex +  $this->iResultsToDisplay) . "\" />\n";
+			/* Display only the next button */
+			if (($this->iStartIndex + $this->iResultsToDisplay) < $this->getResultCount($sql) && $this->iStartIndex == 0) {
+				$sToRender .= "<td>";
+				//$sToRender .= ("<a href=\"" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex +  $this->iResultsToDisplay) . "\">Next</a>");
+				$sToRender .= ("<input type=\"image\" src=\"$default->graphicsUrl/widgets/next.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex +  $this->iResultsToDisplay) . "')\" />");
+				$sToRender .= "</td>\n";
+			}
+			/* Display both the next and the previous buttons */		
+			else if (($this->iStartIndex + $this->iResultsToDisplay) < $this->getResultCount($sql) && $this->iStartIndex > 0) {
+				$sToRender .= "<td>";
+				$sToRender .= ("<input type=\"image\" src=\"$default->graphicsUrl/widgets/next.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex +  $this->iResultsToDisplay) . "')\" />");
+				$sToRender .= "</td>";
+				$sToRender .= "<td>";
+				$sToRender .= ("<input type=\"image\" src=\"$default->graphicsUrl/widgets/previous.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex -  $this->iResultsToDisplay) . "')\" />");
+				$sToRender .= "</td>\n";
+				
+			}	
+			/* Display only the previous button */
+			else if ($this->iStartIndex > 0) {
+				$sToRender .= "<td>\n";
+				$sToRender .= ("&nbsp");
+				$sToRender .= "</td>";
+				$sToRender .= "<td>\n";
+				$sToRender .= ("<input type=\"image\" src=\"$default->graphicsUrl/widgets/previous.gif\" onClick=\"setActionAndSubmit('" . $_SERVER["PHP_SELF"] . "?fStartIndex=" . ($this->iStartIndex -  $this->iResultsToDisplay) . "')\" />");
+				$sToRender .= "</td>";
+			}
+			
+			$sToRender .= "</tr>\n";
+			$sToRender .= "</table>\n";
 		}
-		
-		$sToRender .= "</tr>\n";
-		$sToRender .= "</table>\n";		
 		return $sToRender;
 	}