diff --git a/search2/search/expr.inc.php b/search2/search/expr.inc.php
index 6881d6b..7ac63ff 100755
--- a/search2/search/expr.inc.php
+++ b/search2/search/expr.inc.php
@@ -1289,8 +1289,13 @@ class SQLQueryBuilder implements QueryBuilder
 
         if ($this->context == ExprContext::DOCUMENT)
         {
-             $sql .= "dmv.status_id=1 AND d.status_id=1 AND  \n ";
+             $sql .= "dmv.status_id=1 AND d.status_id=1 AND d.linked_document_id is null";
         }
+        else
+        {
+            $sql .= "f.linked_folder_id is null";
+        }
+        $sql .= ' AND ';
        	return $sql;
 	}