diff --git a/src/java/fr/paris/lutece/plugins/document/service/docsearch/DocSearchService.java b/src/java/fr/paris/lutece/plugins/document/service/docsearch/DocSearchService.java
index 2ce4fbe3..08c00631 100644
--- a/src/java/fr/paris/lutece/plugins/document/service/docsearch/DocSearchService.java
+++ b/src/java/fr/paris/lutece/plugins/document/service/docsearch/DocSearchService.java
@@ -120,7 +120,7 @@ public class DocSearchService
     public DocSearchService(  )
     {
         // Read configuration properties
-        _strIndex = AppPathService.getPath( PATH_INDEX );
+        _strIndex = AppPropertiesService.getProperty( PATH_INDEX );
 
         if ( ( _strIndex == null ) || ( _strIndex.equals( StringUtils.EMPTY ) ) )
         {
@@ -136,7 +136,7 @@ public DocSearchService(  )
 
         try
         {
-            _analyzer = (Analyzer) Class.forName( strAnalyserClassName ).newInstance(  );
+            _analyzer = (Analyzer) Class.forName( strAnalyserClassName ).getDeclaredConstructor( ).newInstance(  );
         }
         catch ( Exception e )
         {
@@ -156,7 +156,7 @@ public DocSearchService(  )
      * @deprecated Use {@code @Inject} to obtain the {@link DocSearchService} 
      * instance. This method will be removed in future versions.
      */
-    @Deprecated( since = "8.0", forRemoval = true )
+    @Deprecated( since = "6.0", forRemoval = true )
     public static DocSearchService getInstance(  )
     {
         return CDI.current( ).select( DocSearchService.class ).get( );
diff --git a/webapp/WEB-INF/conf/plugins/document.properties b/webapp/WEB-INF/conf/plugins/document.properties
index f4b116f3..69b2ef0d 100644
--- a/webapp/WEB-INF/conf/plugins/document.properties
+++ b/webapp/WEB-INF/conf/plugins/document.properties
@@ -25,7 +25,7 @@ document.metadata.handler.dublincore.beanName=document.metadataDublinCore
 document.metadata.handler.dublincore.description=Dublin Core
 
 # internal document search
-document.docsearch.lucene.indexPath=/plugins/document/index
+document.docsearch.lucene.indexPath=java.io.tmpdir/plugins/document/index
 document.docsearch.lucene.writer.mergeFactor=20
 document.docsearch.lucene.writer.maxFieldLength=1000000
 document.docsearch.lucene.analyser.className=fr.paris.lutece.plugins.lucene.service.analyzer.LuteceFrenchAnalyzer
diff --git a/webapp/plugins/document/index/_r3.cfe b/webapp/plugins/document/index/_r3.cfe
deleted file mode 100644
index 9abb241b..00000000
Binary files a/webapp/plugins/document/index/_r3.cfe and /dev/null differ
diff --git a/webapp/plugins/document/index/_r3.cfs b/webapp/plugins/document/index/_r3.cfs
deleted file mode 100644
index cb727089..00000000
Binary files a/webapp/plugins/document/index/_r3.cfs and /dev/null differ
diff --git a/webapp/plugins/document/index/_r3.si b/webapp/plugins/document/index/_r3.si
deleted file mode 100644
index 6b907ea2..00000000
Binary files a/webapp/plugins/document/index/_r3.si and /dev/null differ
diff --git a/webapp/plugins/document/index/segments_rr b/webapp/plugins/document/index/segments_rr
deleted file mode 100644
index 618ac26c..00000000
Binary files a/webapp/plugins/document/index/segments_rr and /dev/null differ
diff --git a/webapp/plugins/document/index/write.lock b/webapp/plugins/document/index/write.lock
deleted file mode 100644
index e69de29b..00000000