diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java
index 429cff5..b8f1774 100644
--- a/app/src/main/java/com/fox2code/mmm/MainActivity.java
+++ b/app/src/main/java/com/fox2code/mmm/MainActivity.java
@@ -591,7 +591,7 @@ public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRe
     public boolean onQueryTextSubmit(final String query) {
         this.searchView.clearFocus();
         if (this.initMode) return false;
-        TrackHelper.track().event("search", query).with(MainApplication.getINSTANCE().getTracker());
+        TrackHelper.track().search(query).with(MainApplication.getINSTANCE().getTracker());
         if (this.moduleViewListBuilder.setQueryChange(query)) {
             Timber.i("Query submit: %s on offline list", query);
             new Thread(() -> this.moduleViewListBuilder.applyTo(moduleList, moduleViewAdapter), "Query update thread").start();
@@ -607,7 +607,7 @@ public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRe
     @Override
     public boolean onQueryTextChange(String query) {
         if (this.initMode) return false;
-        TrackHelper.track().event("search_type", query).with(MainApplication.getINSTANCE().getTracker());
+        TrackHelper.track().search(query).with(MainApplication.getINSTANCE().getTracker());
         if (this.moduleViewListBuilder.setQueryChange(query)) {
             Timber.i("Query submit: %s on offline list", query);
             new Thread(() -> this.moduleViewListBuilder.applyTo(moduleList, moduleViewAdapter), "Query update thread").start();
diff --git a/app/src/main/java/com/fox2code/mmm/MainApplication.java b/app/src/main/java/com/fox2code/mmm/MainApplication.java
index aa2251f..575965f 100644
--- a/app/src/main/java/com/fox2code/mmm/MainApplication.java
+++ b/app/src/main/java/com/fox2code/mmm/MainApplication.java
@@ -372,7 +372,7 @@ public class MainApplication extends FoxApplication implements androidx.work.Con
     public synchronized Tracker getTracker() {
         if (tracker == null) {
             tracker = TrackerBuilder.createDefault(BuildConfig.ANALYTICS_ENDPOINT, 1).build(Matomo.getInstance(this));
-            tracker.setDispatchTimeout(10);
+            tracker.startNewSession();
             tracker.setDispatchInterval(1000);
         }
         return tracker;
diff --git a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
index fb050f8..8814f83 100644
--- a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
+++ b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
@@ -166,6 +166,7 @@ public class InstallerActivity extends FoxActivity {
         wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Fox:Installer");
         this.progressIndicator.setVisibility(View.VISIBLE);
         if (urlMode) this.installerTerminal.addLine("- Downloading " + name);
+        TrackHelper.track().event("installer_start", name).with(MainApplication.getINSTANCE().getTracker());
         String finalTarget = target;
         new Thread(() -> {
             // ensure module cache is is in our cache dir