diff --git a/src/Model/SearchDocument.php b/src/Model/SearchDocument.php
index 91d18b0..bc46694 100644
--- a/src/Model/SearchDocument.php
+++ b/src/Model/SearchDocument.php
@@ -119,8 +119,10 @@ public function makeSearchContent()
                 $contents = strip_tags($html);
             }
 
-
             $this->Title = $origin->getTitle();
+            if ($this->Origin()->hasMethod('updateSearchContents')) {
+                $this->Origin()->updateSearchContents($contents);
+            }
             if ($contents) {
                 $contents = preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $contents);
                 $this->Content = $contents;
@@ -134,49 +136,6 @@ public function makeSearchContent()
             SSViewer::set_themes($oldThemes);
         }
         return implode($output);
-
-
-        /*
-        $searchLink = $origin->getGenerateSearchLink();
-
-        try {
-            $client = new Client();
-            $res = $client->request('GET', $searchLink);
-            if ($res->getStatusCode() == 200) {
-                $body = $res->getBody();
-
-                $x_path = $origin->config()->get('search_x_path');
-                if (!$x_path) {
-                    $x_path = self::config()->get('search_x_path');
-                }
-
-                if ($x_path) {
-                    $domDoc = new \DOMDocument();
-                    @$domDoc->loadHTML($body);
-
-                    $finder = new \DOMXPath($domDoc);
-                    $nodes = $finder->query("//*[contains(@class, '$x_path')]");
-                    $nodeValues = [];
-                    if ($nodes->length) {
-                        foreach ($nodes as $node) {
-                            $nodeValues[] = $node->nodeValue;
-                        }
-                    }
-                    $contents = implode("\n\n", $nodeValues);
-                } else {
-                    $contents = strip_tags($body);
-                }
-
-                $this->Title = $origin->getTitle();
-                if ($contents) {
-                    $this->Content = $contents;
-                }
-                $this->write();
-            }
-        } catch(\Exception $e) {}
-        */
-
-
     }
 
     /**
diff --git a/src/ORM/Connect/MySQLDatabase.php b/src/ORM/Connect/MySQLDatabase.php
index 514f760..2e297c4 100644
--- a/src/ORM/Connect/MySQLDatabase.php
+++ b/src/ORM/Connect/MySQLDatabase.php
@@ -174,7 +174,10 @@ public function searchEngine(
         $objects = array();
 
         foreach ($records as $record) {
-            $objects[] = DataList::create($record['ClassName'])->byID($record['ID']);
+            $object = DataList::create($record['ClassName'])->byID($record['ID']);
+            if ($object->canView()) {
+                $objects[] = $object;
+            }
         }
 
         $list = new PaginatedList(new ArrayList($objects));