diff --git a/module/search/model.php b/module/search/model.php
index 0a2fd0b35a..5a604591ad 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -665,8 +665,8 @@ class searchModel extends model
         $index->objectType = $objectType;
         $index->objectID   = $object->{$fields->id};
         $index->title      = $object->{$fields->title};
-        $index->addedDate  = !empty($object->{$fields->addedDate})  ? $object->{$fields->addedDate}  : NULL;
-        $index->editedDate = !empty($object->{$fields->editedDate}) ? $object->{$fields->editedDate} : NULL;
+        $index->addedDate  = !empty($object->{$fields->addedDate})  ? (!helper::isZeroDate($object->{$fields->addedDate})  ? $object->{$fields->addedDate}  : NULL) : NULL;
+        $index->editedDate = !empty($object->{$fields->editedDate}) ? (!helper::isZeroDate($object->{$fields->editedDate}) ? $object->{$fields->editedDate} : NULL) : NULL;
         $index->vision     = isset($object->vision) ? $object->vision : 'rnd';
 
         $index->content = '';
diff --git a/module/search/tao.php b/module/search/tao.php
index bdf93b46cd..9685ae7788 100644
--- a/module/search/tao.php
+++ b/module/search/tao.php
@@ -1216,7 +1216,7 @@ class searchTao extends searchModel
                 if($convertedFile) $object->comment .= substr(file_get_contents($convertedFile), 0, $this->config->search->maxFileSize);
             }
 
-            if($file->extension == 'txt') $object->comment .= substr(file_get_contents($file->realPath), 0, $this->config->search->maxFileSize);
+            if($file->extension == 'txt' && file_exists($file->realPath)) $object->comment .= substr(file_get_contents($file->realPath), 0, $this->config->search->maxFileSize);
         }
 
         $object->comment = htmlspecialchars($object->comment);