diff --git a/mod/search.php b/mod/search.php
index 9c82b38e81..bb33fb11d2 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -35,13 +35,9 @@ function search_content(&$a) {
 	if(! $search)
 		return $o;
 
-
-	$sql_extra = "
-		AND `item`.`allow_cid` = '' 
-		AND `item`.`allow_gid` = '' 
-		AND `item`.`deny_cid`  = '' 
-		AND `item`.`deny_gid`  = '' 
-	";
+	// Here is the way permissions work in the search module...
+	// Only public wall posts can be shown
+	// OR your own posts if you are a logged in member
 
 	$s_bool  = "AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )";
 	$s_regx  = "AND `item`.`body` REGEXP '%s' ";
@@ -54,10 +50,10 @@ function search_content(&$a) {
 	$r = q("SELECT COUNT(*) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
-		AND ( `wall` = 1 OR `contact`.`uid` = %d )
+		AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' ) 
+			OR `item`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		$search_alg
-		$sql_extra ",
+		$search_alg ",
 		intval(local_user()),
 		dbesc($search)
 	);
@@ -78,10 +74,10 @@ function search_content(&$a) {
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` 
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
-		AND ( `wall` = 1 OR `contact`.`uid` = %d )
+		AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' ) 
+			OR `item`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		$search_alg
-		$sql_extra
 		ORDER BY `parent` DESC ",
 		intval(local_user()),
 		dbesc($search)