diff --git a/app/src/main/java/net/moasdawiki/app/WikiEngineApplication.java b/app/src/main/java/net/moasdawiki/app/WikiEngineApplication.java
index 0fff349..ea13de6 100644
--- a/app/src/main/java/net/moasdawiki/app/WikiEngineApplication.java
+++ b/app/src/main/java/net/moasdawiki/app/WikiEngineApplication.java
@@ -54,6 +54,7 @@ public class WikiEngineApplication extends Application {
     private Settings settings;
     private Messages messages;
     private WikiService wikiService;
+    private SearchService searchService;
     private SynchronizeWikiClient synchronizeWikiClient;
     private TerminTransformer terminTransformer;
     private RequestDispatcher requestDispatcher;
@@ -68,12 +69,11 @@ public class WikiEngineApplication extends Application {
         File internalStorageRepositoryRoot = new File(getFilesDir(), REPOSITORY_ROOT_PATH_DEFAULT);
 
         // basic services
-        repositoryService = new RepositoryService(logger, internalStorageRepositoryRoot);
-        repositoryService.init();
+        repositoryService = new RepositoryService(logger, internalStorageRepositoryRoot, false);
         settings = new AndroidSettings(logger, repositoryService, Settings.getConfigFileApp());
         messages = new Messages(logger, settings, repositoryService);
-        wikiService = new WikiService(logger, repositoryService);
-        SearchService searchService = new SearchService(logger, repositoryService, wikiService, false);
+        wikiService = new WikiService(logger, repositoryService, false);
+        searchService = new SearchService(logger, repositoryService, wikiService, false);
 
         // App: use SynchronizeWikiClient instead of SynchronizationService
         synchronizeWikiClient = new SynchronizeWikiClient(this, logger, settings, repositoryService);
@@ -82,7 +82,7 @@ public class WikiEngineApplication extends Application {
         // do not run the SynchronizationPageTransformer
         IncludePageTransformer includePageTransformer = new IncludePageTransformer(logger, wikiService);
         KontaktseiteTransformer kontaktseiteTransformer = new KontaktseiteTransformer();
-        terminTransformer = new TerminTransformer(logger, messages, repositoryService, wikiService);
+        terminTransformer = new TerminTransformer(logger, messages, repositoryService, wikiService, false);
         WikiTagsTransformer wikiTagsTransformer = new WikiTagsTransformer(logger, settings, messages, wikiService);
         // list of transformers, the order matters
         TransformWikiPage[] transformers = {includePageTransformer, kontaktseiteTransformer, terminTransformer, wikiTagsTransformer};
@@ -101,10 +101,12 @@ public class WikiEngineApplication extends Application {
     }
 
     public void resetServices() {
-        repositoryService.rebuildCache();
-        wikiService.reset();
+        repositoryService.reset();
         settings.reset();
         messages.reset();
+        wikiService.reset();
+        searchService.reset();
+        terminTransformer.reset();
     }
 
     @Override