diff --git a/boot.php b/boot.php
index adaff5f49a..6d1ea165cb 100644
--- a/boot.php
+++ b/boot.php
@@ -1375,8 +1375,10 @@ function get_tags($s) {
 	$ret = array();
 	if(preg_match_all('/([@#][^ ,:?]*)([ ,:?]|$)/',$s,$match)) {
 		foreach($match[1] as $match) {
-			if(strstr($match,"]"))
+			if(strstr($match,"]")) {
+				// we might be inside a bbcode color tag - leave it alone
 				continue;
+			}
 			if(substr($match,-1,1) === '.')
 				$ret[] = substr($match,0,-1);
 			else
diff --git a/mod/search.php b/mod/search.php
index 5aa16716b5..19bf6b964f 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -117,6 +117,9 @@ function search_content(&$a) {
 
 		}
 	}
+
+	$o .= paginate($a);
+
 	return $o;
 }