diff --git a/src/main/java/org/olat/modules/qpool/manager/QuestionItemDocumentFactory.java b/src/main/java/org/olat/modules/qpool/manager/QuestionItemDocumentFactory.java
index 58600b25e0a5b16d9114c652bc02ec1c95025fd6..830a331088eaa393770c9248520104c16af271a6 100644
--- a/src/main/java/org/olat/modules/qpool/manager/QuestionItemDocumentFactory.java
+++ b/src/main/java/org/olat/modules/qpool/manager/QuestionItemDocumentFactory.java
@@ -87,7 +87,6 @@ public class QuestionItemDocumentFactory {
 		oDocument.setParentContextType(searchResourceContext.getParentContextType());
 		oDocument.setParentContextName(searchResourceContext.getParentContextName());
 
-		System.out.println(item.getTitle());
 		//author
 		StringBuilder authorSb = new StringBuilder();
 		List<Identity> owners = qpoolService.getAuthors(item);
diff --git a/src/main/java/org/olat/search/_spring/searchContext.xml b/src/main/java/org/olat/search/_spring/searchContext.xml
index a006db5e9ba8badfb43261dbea65ef9ba0211866..20839505dfa500a9d1fce9f29c17c1c3ab7674e6 100644
--- a/src/main/java/org/olat/search/_spring/searchContext.xml
+++ b/src/main/java/org/olat/search/_spring/searchContext.xml
@@ -80,6 +80,8 @@
 			<list>
 				<!-- list of files which will not be indexed -->
 				<value>ppt</value>
+				<value>doc</value>
+				<value>xls</value>
 			</list>
 		</constructor-arg>
 	</bean>
diff --git a/src/main/java/org/olat/search/service/SearchServiceImpl.java b/src/main/java/org/olat/search/service/SearchServiceImpl.java
index 81ddaacfe78676cc893e172f88182bc84f973cad..c4183b2b86c089ad58c01c7339fd91a0249eb2fc 100644
--- a/src/main/java/org/olat/search/service/SearchServiceImpl.java
+++ b/src/main/java/org/olat/search/service/SearchServiceImpl.java
@@ -598,10 +598,13 @@ public class SearchServiceImpl implements SearchService, GenericEventListener {
 	throws IOException {
 		try {
 			File indexFile = new File(searchModuleConfig.getFullIndexPath());
-			Directory directory = FSDirectory.open(indexFile);
-			File permIndexFile = new File(searchModuleConfig.getFullPermanentIndexPath());
-			Directory permDirectory = FSDirectory.open(permIndexFile);
-			return DirectoryReader.indexExists(directory) && DirectoryReader.indexExists(permDirectory);
+			if(indexFile.exists()) {
+				Directory directory = FSDirectory.open(indexFile);
+				File permIndexFile = new File(searchModuleConfig.getFullPermanentIndexPath());
+				Directory permDirectory = FSDirectory.open(permIndexFile);
+				return DirectoryReader.indexExists(directory) && DirectoryReader.indexExists(permDirectory);
+			}
+			return false;
 		} catch (IOException e) {
 			throw e;
 		}
diff --git a/src/main/java/org/olat/search/service/document/file/ExcelDocument.java b/src/main/java/org/olat/search/service/document/file/ExcelDocument.java
index 6f3f41e5ae1b251ae76cac9560cf7b7db5905329..80cde4c92bcc0a78e20a578f3abce6f4d0e7b2e9 100644
--- a/src/main/java/org/olat/search/service/document/file/ExcelDocument.java
+++ b/src/main/java/org/olat/search/service/document/file/ExcelDocument.java
@@ -34,7 +34,7 @@ import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.olat.core.gui.util.CSSHelper;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
@@ -87,12 +87,10 @@ public class ExcelDocument extends FileDocument {
 							for (int cellNumber = row.getFirstCellNum(); cellNumber <= row.getLastCellNum(); cellNumber++) {
 								HSSFCell cell = row.getCell(cellNumber);
 								if (cell != null) {
-									// if (cell.getCellStyle().equals(HSSFCell.CELL_TYPE_NUMERIC))
-									if (cell.getCellType() == Cell.CELL_TYPE_STRING) {
+									if (cell.getCellTypeEnum() == CellType.STRING) {
 										content.append(cell.getStringCellValue()).append(' ');
 									}
 								} else {
-									// throw new DocumentException();
 									cellNullCounter++;
 								}
 							}
diff --git a/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java b/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java
index 3ec43c2c64de03dc4d6a1bb5968a4a723305fb60..6a8e9427bbe5927742967af251d005caad00040c 100644
--- a/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java
+++ b/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java
@@ -249,7 +249,7 @@ public class FileDocumentFactory {
 		if (searchModule.getFileSizeSuffixes().contains(suffix)) {
 			long maxFileSize = searchModule.getMaxFileSize();
 			if ( (maxFileSize != 0) && (fileSize > maxFileSize) ) {
-				log.info("File too big, exlude from search index. filename=" + fileName);
+				log.info("File too big, exclude from search index. filename=" + fileName);
 				excludedFileSizeCount++;
 				return false;
 			}