diff --git a/src/add-ons/index_server/FullText/CLuceneDataBase.cpp b/src/add-ons/index_server/FullText/CLuceneDataBase.cpp
index a6147d644b..986259549f 100644
--- a/src/add-ons/index_server/FullText/CLuceneDataBase.cpp
+++ b/src/add-ons/index_server/FullText/CLuceneDataBase.cpp
@@ -72,17 +72,27 @@ CLuceneWriteDataBase::InitCheck()
 status_t
 CLuceneWriteDataBase::AddDocument(const entry_ref& ref)
 {
+	// check if already in the queue
+	for (unsigned int i = 0; i < fAddQueue.size(); i++) {
+		if (fAddQueue.at(i) == ref)
+			return B_OK;
+	}
 	fAddQueue.push_back(ref);
 
-	return B_ERROR;
+	return B_OK;
 }
 
 
 status_t
 CLuceneWriteDataBase::RemoveDocument(const entry_ref& ref)
 {
+	// check if already in the queue
+	for (unsigned int i = 0; i < fAddQueue.size(); i++) {
+		if (fDeleteQueue.at(i) == ref)
+			return B_OK;
+	}
 	fDeleteQueue.push_back(ref);
-	return B_ERROR;
+	return B_OK;
 }
 
 
diff --git a/src/add-ons/index_server/FullText/FullTextAnalyser.cpp b/src/add-ons/index_server/FullText/FullTextAnalyser.cpp
index 2d9a5439af..e1e9c23796 100644
--- a/src/add-ons/index_server/FullText/FullTextAnalyser.cpp
+++ b/src/add-ons/index_server/FullText/FullTextAnalyser.cpp
@@ -81,7 +81,7 @@ FullTextAnalyser::AnalyseEntry(const entry_ref& ref)
 void
 FullTextAnalyser::DeleteEntry(const entry_ref& ref)
 {
-	if (!_InterestingEntry(ref))
+	if (_IsInIndexDirectory(ref))
 		return;
 	STRACE("FullTextAnalyser DeleteEntry: %s\n", ref.name);
 	fWriteDataBase->RemoveDocument(ref);