diff --git a/mon-entreprise/scripts/fetch-stats.js b/mon-entreprise/scripts/fetch-stats.js
index a007c97f7..eb35e7c76 100644
--- a/mon-entreprise/scripts/fetch-stats.js
+++ b/mon-entreprise/scripts/fetch-stats.js
@@ -67,6 +67,24 @@ async function fetchSimulatorsMonth() {
 }
 
 async function fetchSimulators(dt) {
+	async function fetchSubTableData(data, label) {
+		const subTable = data.find(page => page.label === label)
+		if (!subTable) {
+			console.log('No subtable for ' + label + ' for the period ' + dt + '.')
+			return []
+		}
+		
+		const response = await fetch(
+			apiURL({
+				date: `${dt}`,
+				method: 'Actions.getPageUrls',
+				search_recursive: 1,
+				filter_limits: -1,
+				idSubtable: subTable.idsubdatatable
+			})
+		)
+		return await response.json()
+	}
 	try {
 		const response = await fetch(
 			apiURL({
@@ -83,38 +101,11 @@ async function fetchSimulators(dt) {
 		)
 
 		// Visits on simulators pages
-		const idSubTableSimulateurs = firstLevelData.find(
-			page => page.label === 'simulateurs'
-		).idsubdatatable
+		const dataSimulateurs = await fetchSubTableData(firstLevelData, 'simulateurs')
+		const dataGérer = await fetchSubTableData(firstLevelData, 'gérer')
+		const dataProfessionLiberale = await fetchSubTableData(dataSimulateurs, 'profession-liberale')
 
-		const responseSimulateurs = await fetch(
-			apiURL({
-				date: `${dt}`,
-				method: 'Actions.getPageUrls',
-				search_recursive: 1,
-				filter_limits: -1,
-				idSubtable: idSubTableSimulateurs
-			})
-		)
-
-		const dataSimulateurs = await responseSimulateurs.json()
-
-		// Visits on "manage" pages
-		const idSubTableManage = firstLevelData.find(page => page.label === 'gérer')
-			.idsubdatatable
-
-		const responseManage = await fetch(
-			apiURL({
-				date: `${dt}`,
-				method: 'Actions.getPageUrls',
-				search_recursive: 1,
-				filter_limits: -1,
-				idSubtable: idSubTableManage
-			})
-		)
-		const dataManage = await responseManage.json()
-
-		const resultSimulateurs = [...dataSimulateurs, ...dataManage]
+		const resultSimulateurs = [...dataSimulateurs, ...dataProfessionLiberale, ...dataGérer]
 			.filter(({ label }) =>
 				[
 					'/salaire-brut-net',
@@ -127,12 +118,12 @@ async function fetchSimulators(dt) {
 					'/aide-declaration-independants',
 					'/demande-mobilité',
 					'/profession-liberale',
-					'/profession-liberale/medecin',
-					'/profession-liberale/auxiliaire-medical',
-					'/profession-liberale/sage-femme',
-					'/profession-liberale/chirugien-dentiste',
-					'/profession-liberale/avocat',
-					'/profession-liberale/expert-comptable',
+					'/medecin',
+					'/auxiliaire-medical',
+					'/sage-femme',
+					'/chirugien-dentiste',
+					'/avocat',
+					'/expert-comptable',
 					'/économie-collaborative'
 				].includes(label)
 			)
@@ -148,36 +139,25 @@ async function fetchSimulators(dt) {
 							.reduce((a, b) => Math.min(a, b.nb_visits), 1000)
 			)
 
-		// Add iframes
-		const idTableIframes = firstLevelData.find(page => page.label == 'iframes')
-			.idsubdatatable
-		const responseIframes = await fetch(
-			apiURL({
-				date: `${dt}`,
-				method: 'Actions.getPageUrls',
-				search_recursive: 1,
-				filter_limits: -1,
-				idSubtable: idTableIframes
-			})
-		)
-		const dataIframes = await responseIframes.json()
-		const resultIframes = dataIframes.filter(x =>
-			[
-				'/simulateur-embauche',
-				'/simulateur-autoentrepreneur',
-				'/simulateur-assimilesalarie',
-				'/simulateur-artiste-auteur',
-				'/simulateur-independant',
-				'/demande-mobilite',
-				'/profession-liberale',
-				'/chirugien-dentiste',
-				'/auxiliaire-medical',
-				'/sage-femme',
-				'/medecin',
-				'/avocat',
-				'/expert-comptable'
-			].some(path => x.label.startsWith(path))
-		)
+
+		const resultIframes = (await fetchSubTableData(firstLevelData, 'iframes'))
+			.filter(x =>
+				[
+					'/simulateur-embauche',
+					'/simulateur-autoentrepreneur',
+					'/simulateur-assimilesalarie',
+					'/simulateur-artiste-auteur',
+					'/simulateur-independant',
+					'/demande-mobilite',
+					'/profession-liberale',
+					'/medecin',
+					'/auxiliaire-medical',
+					'/sage-femme',
+					'/chirugien-dentiste',
+					'/avocat',
+					'/expert-comptable',
+				].some(path => x.label.startsWith(path))
+			)
 
 		const groupSimulateursIframesVisits = ({ label }) =>
 			label.startsWith('/coronavirus')
@@ -209,6 +189,8 @@ async function fetchSimulators(dt) {
 			.map(([label, nb_visits]) => ({ label, nb_visits }))
 			.sort((a, b) => b.nb_visits - a.nb_visits)
 	} catch (e) {
+		console.error(e)
+
 		console.log('fail to fetch Simulators Visits')
 		return null
 	}
diff --git a/mon-entreprise/source/sites/mon-entreprise.fr/pages/Stats/Stats.tsx b/mon-entreprise/source/sites/mon-entreprise.fr/pages/Stats/Stats.tsx
index 1f37d42ec..3412339ae 100644
--- a/mon-entreprise/source/sites/mon-entreprise.fr/pages/Stats/Stats.tsx
+++ b/mon-entreprise/source/sites/mon-entreprise.fr/pages/Stats/Stats.tsx
@@ -130,7 +130,7 @@ export default function Stats() {
 
 				{stats.simulators[choicesimulators].visites.map(
 					({ label, nb_visits }) => {
-						const details = simulators.find(({ path }) => path?.includes(label))
+						const details = simulators.find(({ path }) => path?.endsWith(label))
 						if (!details) {
 							return null
 						}