diff --git a/site/scripts/stats/fetch-stats.js b/site/scripts/stats/fetch-stats.js
index 731e99357..4033924c2 100644
--- a/site/scripts/stats/fetch-stats.js
+++ b/site/scripts/stats/fetch-stats.js
@@ -70,7 +70,7 @@ const buildSimulateursQuery =
 				filter: {
 					property: {
 						page_chapter1: {
-							$in: ['assistant', 'simulateurs', 'gérer'],
+							$in: ['assistant', 'simulateurs', 'gerer'],
 						},
 					},
 				},
diff --git a/site/source/components/ATInternetTracking/index.tsx b/site/source/components/ATInternetTracking/index.tsx
index 0f2293bed..39f807004 100644
--- a/site/source/components/ATInternetTracking/index.tsx
+++ b/site/source/components/ATInternetTracking/index.tsx
@@ -23,7 +23,6 @@ export function toAtString(string: string): string {
 type Chapter1 =
 	| 'simulateurs'
 	| 'informations'
-	| 'gerer'
 	| 'assistants'
 	| 'documentation'
 	| 'integration'
diff --git a/site/source/pages/assistants/declaration-charges-sociales-independant/config.ts b/site/source/pages/assistants/declaration-charges-sociales-independant/config.ts
index d0a5e7be4..c373e0230 100644
--- a/site/source/pages/assistants/declaration-charges-sociales-independant/config.ts
+++ b/site/source/pages/assistants/declaration-charges-sociales-independant/config.ts
@@ -13,7 +13,7 @@ export function déclarationChargesSocialesIndépendantConfig({
 		iframePath: 'déclaration-charges-sociales-indépendant',
 		icône: '📑',
 		tracking: {
-			chapter1: 'gerer',
+			chapter1: 'assistant',
 			chapter2: 'declaration_charges_sociales_independant',
 		},
 		meta: {
diff --git a/site/source/pages/assistants/declaration-charges-sociales-independant/index.tsx b/site/source/pages/assistants/declaration-charges-sociales-independant/index.tsx
index 962178070..14e22f56c 100644
--- a/site/source/pages/assistants/declaration-charges-sociales-independant/index.tsx
+++ b/site/source/pages/assistants/declaration-charges-sociales-independant/index.tsx
@@ -101,7 +101,7 @@ export default function AideDéclarationIndépendant() {
 				</Body>
 			</Trans>
 			{Object.keys(situation).length ? (
-				<TrackPage name="commence" />
+				<TrackPage name="simulation commencée" />
 			) : (
 				<TrackPage name="accueil" />
 			)}
diff --git a/site/source/pages/assistants/demande-mobilité/config.ts b/site/source/pages/assistants/demande-mobilité/config.ts
index 0fce35080..b71ff10ba 100644
--- a/site/source/pages/assistants/demande-mobilité/config.ts
+++ b/site/source/pages/assistants/demande-mobilité/config.ts
@@ -11,7 +11,7 @@ export function demandeMobilitéConfig({ t, sitePaths }: SimulatorsDataParams) {
 		path: sitePaths.assistants.formulaireMobilité,
 		icône: '🧳',
 		tracking: {
-			chapter1: 'gerer',
+			chapter1: 'assistant',
 			chapter2: 'demande_mobilite',
 		},
 		meta: {
diff --git a/site/source/pages/assistants/demande-mobilité/index.tsx b/site/source/pages/assistants/demande-mobilité/index.tsx
index a19548ae7..b377f5c39 100644
--- a/site/source/pages/assistants/demande-mobilité/index.tsx
+++ b/site/source/pages/assistants/demande-mobilité/index.tsx
@@ -246,7 +246,7 @@ function FormulairePublicodes() {
 			{!Object.keys(situation).length ? (
 				<TrackPage name="accueil" />
 			) : missingValues.length ? (
-				<TrackPage name="commence" />
+				<TrackPage name="simulation commencée" />
 			) : null}
 		</>
 	)
diff --git a/site/source/pages/assistants/pour-mon-entreprise/config.tsx b/site/source/pages/assistants/pour-mon-entreprise/config.tsx
index d00c49928..a7c942a5a 100644
--- a/site/source/pages/assistants/pour-mon-entreprise/config.tsx
+++ b/site/source/pages/assistants/pour-mon-entreprise/config.tsx
@@ -33,7 +33,8 @@ export function pourMonEntrepriseConfig({
 			),
 		},
 		tracking: {
-			chapter1: 'gerer',
+			chapter1: 'assistant',
+			chapter2: 'pour_mon_entreprise',
 		},
 		component: PourMonEntreprise as () => JSX.Element, // avoid types loop error
 	} as const)
diff --git a/site/source/pages/statistiques/useStatistiques.tsx b/site/source/pages/statistiques/useStatistiques.tsx
index 9f084f178..d0fb0cf4e 100644
--- a/site/source/pages/statistiques/useStatistiques.tsx
+++ b/site/source/pages/statistiques/useStatistiques.tsx
@@ -87,10 +87,12 @@ function computeVisits(
 			accueil: p.nombre.accueil,
 			simulation_commencee:
 				// In the case of Recherche APE, we need to post-process the data
-				(p.nombre.simulation_commencee ?? 0) + (p.nombre.recherche ?? 0) ||
+				(p.nombre.simulation_commencee ?? 0) +
+					(p.nombre.recherche ?? 0) +
+					(p.nombre.commence ?? 0) ||
 				// If the value is zero, we use simulation terminee instead
 				p.nombre.simulation_terminee,
-			simulation_terminee: p.nombre.simulation_terminee,
+			simulation_terminee: p.nombre.simulation_terminee ?? 0,
 		},
 	})) as Visites