diff --git a/src/__tests__/utilsFunction/paginationUtils.test.ts b/src/__tests__/utilsFunction/paginationUtils.test.ts
index 338880542..fc83fbd86 100644
--- a/src/__tests__/utilsFunction/paginationUtils.test.ts
+++ b/src/__tests__/utilsFunction/paginationUtils.test.ts
@@ -1,4 +1,4 @@
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, getCleanGroupId, handlePageError } from 'utils/paginationUtils'
 import { vi } from 'vitest'
 
 describe('checkIfPageAvailable', () => {
@@ -45,3 +45,63 @@ describe('handlePageError', () => {
     expect(dispatch).toHaveBeenCalled()
   })
 })
+
+describe('test of getCleanGroupId function', () => {
+  it('should return no groupId if perimeter is empty or null', () => {
+    const groupId = ''
+    expect(getCleanGroupId(groupId)).toBeUndefined()
+
+    const groupId2 = null
+    expect(getCleanGroupId(groupId2)).toBeUndefined()
+  })
+  it('should return no groupId if perimeter ids make no sense', () => {
+    const groupId = ',,,,'
+    expect(getCleanGroupId(groupId)).toBeUndefined()
+
+    const groupId2 = ';;;;'
+    expect(getCleanGroupId(groupId2)).toBeUndefined()
+
+    const groupId3 = '-,--'
+    expect(getCleanGroupId(groupId3)).toBeUndefined()
+  })
+  it('should only return numbers separated by commas if groupId is a mess', () => {
+    const groupId = '12345,,nimp,;,8zhbea,,'
+    expect(getCleanGroupId(groupId)).toBe('12345')
+  })
+  it('should return the right ids separated by commas', () => {
+    const groupId = '123,456'
+    expect(getCleanGroupId(groupId)).toBe('123,456')
+  })
+  it('should not return commas that are at the beginning or at the end', () => {
+    const groupId = ',123,456,'
+    expect(getCleanGroupId(groupId)).toBe('123,456')
+  })
+})
+
+describe('test of cleanSearchParams function', () => {
+  it('should return the right url params', () => {
+    const page = '3'
+    const tabId = 'MedicationRequest'
+    const groupId = '123456'
+
+    expect(cleanSearchParams({ page, tabId, groupId })).toStrictEqual({
+      groupId: '123456',
+      page: '3',
+      tabId: 'MedicationRequest'
+    })
+  })
+  it('should not return groupId in the params if groupId makes no sense or is undefined', () => {
+    const page = '1'
+    const groupId2 = 'rijfn236e53:;a'
+    const groupId3 = ',,,'
+
+    expect(cleanSearchParams({ page })).toStrictEqual({ page: '1' })
+    expect(cleanSearchParams({ page, groupId: groupId2 })).toStrictEqual({ page: '1' })
+    expect(cleanSearchParams({ page, groupId: groupId3 })).toStrictEqual({ page: '1' })
+  })
+  it('should not return tabId in the params if tabId is undefined', () => {
+    const page = '1'
+
+    expect(cleanSearchParams({ page })).toStrictEqual({ page: '1' })
+  })
+})
diff --git a/src/__tests__/utilsFunction/tabsUtils.test.ts b/src/__tests__/utilsFunction/tabsUtils.test.ts
new file mode 100644
index 000000000..5efbf3099
--- /dev/null
+++ b/src/__tests__/utilsFunction/tabsUtils.test.ts
@@ -0,0 +1,51 @@
+import { PMSILabel } from 'types/patient'
+import { MedicationLabel, ResourceType } from 'types/requestCriterias'
+import { getMedicationTab, getPMSITab } from 'utils/tabsUtils'
+
+const pmsiDefaultTab = { label: PMSILabel.DIAGNOSTIC, id: ResourceType.CONDITION }
+
+describe('test of getPMSITab', () => {
+  it('should return default tabId is empty', () => {
+    const tabId = ''
+    expect(getPMSITab(tabId)).toStrictEqual(pmsiDefaultTab)
+  })
+  it('should return default tabId doesnt exist in PMSITabs', () => {
+    const tabId = 'whatever'
+    expect(getPMSITab(tabId)).toStrictEqual(pmsiDefaultTab)
+  })
+  it('should return the tab matching to the id given', () => {
+    const tabId = ResourceType.PROCEDURE
+    expect(getPMSITab(tabId)).toStrictEqual({ label: PMSILabel.CCAM, id: ResourceType.PROCEDURE })
+  })
+  it('should return the tab matching to the id given even if the casing is wrong', () => {
+    const tabId = ResourceType.PROCEDURE.toLocaleUpperCase()
+    expect(getPMSITab(tabId)).toStrictEqual({ label: PMSILabel.CCAM, id: ResourceType.PROCEDURE })
+  })
+})
+
+const medicationDefaultTab = { label: MedicationLabel.PRESCRIPTION, id: ResourceType.MEDICATION_REQUEST }
+
+describe('test of getMedicationTab', () => {
+  it('should return default tabId is empty', () => {
+    const tabId = ''
+    expect(getMedicationTab(tabId)).toStrictEqual(medicationDefaultTab)
+  })
+  it('should return default tabId doesnt exist in MedicationTabs', () => {
+    const tabId = 'test'
+    expect(getMedicationTab(tabId)).toStrictEqual(medicationDefaultTab)
+  })
+  it('should return the tab matching to the id given', () => {
+    const tabId = ResourceType.MEDICATION_ADMINISTRATION
+    expect(getMedicationTab(tabId)).toStrictEqual({
+      label: MedicationLabel.ADMINISTRATION,
+      id: ResourceType.MEDICATION_ADMINISTRATION
+    })
+  })
+  it('should return the tab matching to the id given even if the casing is wrong', () => {
+    const tabId = ResourceType.MEDICATION_ADMINISTRATION.toLocaleUpperCase()
+    expect(getMedicationTab(tabId)).toStrictEqual({
+      label: MedicationLabel.ADMINISTRATION,
+      id: ResourceType.MEDICATION_ADMINISTRATION
+    })
+  })
+})
diff --git a/src/components/CohortsTable/index.tsx b/src/components/CohortsTable/index.tsx
index 4630f0d81..916084d19 100644
--- a/src/components/CohortsTable/index.tsx
+++ b/src/components/CohortsTable/index.tsx
@@ -106,7 +106,12 @@ const ResearchTable: React.FC<ResearchTableProps> = ({
       row.request_job_status === CohortJobStatus.FAILED
     )
       return
-    navigate(`/cohort/${row.group_id}`)
+
+    const searchParams = new URLSearchParams()
+    if (row.group_id) {
+      searchParams.set('groupId', row.group_id)
+    }
+    navigate(`/cohort?${searchParams.toString()}`)
   }
 
   const handleClickOpenDialog = () => {
diff --git a/src/components/Dashboard/BiologyList/index.tsx b/src/components/Dashboard/BiologyList/index.tsx
index 5e73af3ed..34a4947aa 100644
--- a/src/components/Dashboard/BiologyList/index.tsx
+++ b/src/components/Dashboard/BiologyList/index.tsx
@@ -36,19 +36,19 @@ import {
   fetchLoincCodes as fetchLoincCodesApi,
   fetchAnabioCodes as fetchAnabioCodesApi
 } from 'services/aphp/serviceBiology'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
 
 type BiologyListProps = {
-  groupId?: string
   deidentified?: boolean
 }
 
-const BiologyList = ({ groupId, deidentified }: BiologyListProps) => {
+const BiologyList = ({ deidentified }: BiologyListProps) => {
   const theme = useTheme()
   const isMd = useMediaQuery(theme.breakpoints.down('lg'))
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
 
   const [toggleFilterByModal, setToggleFilterByModal] = useState(false)
   const [toggleSaveFiltersModal, setToggleSaveFiltersModal] = useState(false)
@@ -203,7 +203,8 @@ const BiologyList = ({ groupId, deidentified }: BiologyListProps) => {
   ])
 
   useEffect(() => {
-    setSearchParams({ page: page.toString() })
+    setSearchParams(cleanSearchParams({ page: page.toString(), groupId: groupId }))
+
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
 
diff --git a/src/components/Dashboard/Documents/Documents.tsx b/src/components/Dashboard/Documents/Documents.tsx
index 4a6c2366a..49bd8fc98 100644
--- a/src/components/Dashboard/Documents/Documents.tsx
+++ b/src/components/Dashboard/Documents/Documents.tsx
@@ -43,19 +43,19 @@ import EncounterStatusFilter from 'components/Filters/EncounterStatusFilter'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
 import { CanceledError } from 'axios'
 import { DocumentReference } from 'fhir/r4'
 
 type DocumentsProps = {
-  groupId?: string
   deidentified: boolean
 }
 
-const Documents: React.FC<DocumentsProps> = ({ groupId, deidentified }) => {
+const Documents: React.FC<DocumentsProps> = ({ deidentified }) => {
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
 
   const [toggleFilterByModal, setToggleFilterByModal] = useState(false)
   const [toggleSaveFiltersModal, setToggleSaveFiltersModal] = useState(false)
@@ -234,7 +234,7 @@ const Documents: React.FC<DocumentsProps> = ({ groupId, deidentified }) => {
   ])
 
   useEffect(() => {
-    setSearchParams({ page: page.toString() })
+    setSearchParams(cleanSearchParams({ page: page.toString(), groupId: groupId }))
 
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
diff --git a/src/components/Dashboard/FormsList/index.tsx b/src/components/Dashboard/FormsList/index.tsx
index d84171b7e..289ec9748 100644
--- a/src/components/Dashboard/FormsList/index.tsx
+++ b/src/components/Dashboard/FormsList/index.tsx
@@ -22,19 +22,17 @@ import { Questionnaire } from 'fhir/r4'
 import MaternityFormFilter from 'components/Filters/MaternityFormFilter'
 import DataTableForms from 'components/DataTable/DataTableForms'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
 import Chip from 'components/ui/Chip'
 
-type FormsListProps = {
-  groupId?: string
-}
-
-const FormsList = ({ groupId }: FormsListProps) => {
+const FormsList = () => {
   const theme = useTheme()
   const isSm = useMediaQuery(theme.breakpoints.down('md'))
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const pageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
+
   const [toggleFilterByModal, setToggleFilterByModal] = useState(false)
   const [encounterStatusList, setEncounterStatusList] = useState<Hierarchy<any, any>[]>([])
   const [questionnaires, setQuestionnaires] = useState<Questionnaire[]>([])
@@ -142,7 +140,8 @@ const FormsList = ({ groupId }: FormsListProps) => {
   }, [orderBy, formName, startDate, endDate, executiveUnits, encounterStatus, ipp, groupId])
 
   useEffect(() => {
-    setSearchParams({ page: page.toString() })
+    setSearchParams(cleanSearchParams({ page: page.toString(), groupId: groupId }))
+
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
 
diff --git a/src/components/Dashboard/ImagingList/index.tsx b/src/components/Dashboard/ImagingList/index.tsx
index 642fb597f..cf9d350a8 100644
--- a/src/components/Dashboard/ImagingList/index.tsx
+++ b/src/components/Dashboard/ImagingList/index.tsx
@@ -36,18 +36,18 @@ import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
 import { AppConfig } from 'config'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
 
 type ImagingListProps = {
-  groupId?: string
   deidentified?: boolean
 }
 
-const ImagingList = ({ groupId, deidentified }: ImagingListProps) => {
+const ImagingList = ({ deidentified }: ImagingListProps) => {
   const appConfig = useContext(AppConfig)
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
 
   const [searchResults, setSearchResults] = useState<ResultsType>({ nb: 0, total: 0, label: 'résultats' })
   const [patientsResult, setPatientsResult] = useState<ResultsType>({ nb: 0, total: 0, label: 'patient(s)' })
@@ -184,7 +184,7 @@ const ImagingList = ({ groupId, deidentified }: ImagingListProps) => {
   }, [ipp, nda, startDate, endDate, orderBy, searchInput, executiveUnits, modality, groupId, encounterStatus])
 
   useEffect(() => {
-    setSearchParams({ page: page.toString() })
+    setSearchParams(cleanSearchParams({ page: page.toString(), groupId: groupId }))
 
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
diff --git a/src/components/Dashboard/MedicationList/index.tsx b/src/components/Dashboard/MedicationList/index.tsx
index 611002641..420d172c3 100644
--- a/src/components/Dashboard/MedicationList/index.tsx
+++ b/src/components/Dashboard/MedicationList/index.tsx
@@ -34,15 +34,15 @@ import useSearchCriterias, { initMedSearchCriterias } from 'reducers/searchCrite
 import { cancelPendingRequest } from 'utils/abortController'
 import { selectFiltersAsArray } from 'utils/filters'
 import { mapToLabel } from 'mappers/pmsi'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
+import { getMedicationTab } from 'utils/tabsUtils'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
 
 type MedicationListProps = {
-  groupId?: string
   deidentified?: boolean
 }
 
-const MedicationList = ({ groupId, deidentified }: MedicationListProps) => {
+const MedicationList = ({ deidentified }: MedicationListProps) => {
   const theme = useTheme()
   const isSm = useMediaQuery(theme.breakpoints.down('md'))
   const [toggleFilterByModal, setToggleFilterByModal] = useState(false)
@@ -55,11 +55,11 @@ const MedicationList = ({ groupId, deidentified }: MedicationListProps) => {
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
+  const tabId = searchParams.get('tabId') ?? undefined
+  const existingParams = Object.fromEntries(searchParams.entries())
 
-  const [selectedTab, setSelectedTab] = useState<MedicationTab>({
-    id: ResourceType.MEDICATION_REQUEST,
-    label: MedicationLabel.PRESCRIPTION
-  })
+  const [selectedTab, setSelectedTab] = useState<MedicationTab>(getMedicationTab(tabId))
 
   const [page, setPage] = useState(getPageParam ? parseInt(getPageParam, 10) : 1)
   const {
@@ -228,11 +228,9 @@ const MedicationList = ({ groupId, deidentified }: MedicationListProps) => {
   ])
 
   useEffect(() => {
-    handlePageError(page, setPage, dispatch, setLoadingStatus)
+    setSearchParams(cleanSearchParams({ page: page.toString(), tabId: selectedTab.id, groupId: groupId }))
 
-    const updatedSearchParams = new URLSearchParams(searchParams)
-    updatedSearchParams.set('page', page.toString())
-    setSearchParams(updatedSearchParams)
+    handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
 
   useEffect(() => {
@@ -300,6 +298,7 @@ const MedicationList = ({ groupId, deidentified }: MedicationListProps) => {
               value: TabType<ResourceType.MEDICATION_ADMINISTRATION | ResourceType.MEDICATION_REQUEST, MedicationLabel>
             ) => {
               setSelectedTab(value)
+              setSearchParams({ ...existingParams, tabId: value.id })
             }}
           />
         </Grid>
diff --git a/src/components/Dashboard/PMSIList/index.tsx b/src/components/Dashboard/PMSIList/index.tsx
index b03004e16..805570757 100644
--- a/src/components/Dashboard/PMSIList/index.tsx
+++ b/src/components/Dashboard/PMSIList/index.tsx
@@ -39,14 +39,14 @@ import { cancelPendingRequest } from 'utils/abortController'
 import { selectFiltersAsArray } from 'utils/filters'
 import { mapToLabel, mapToSourceType } from 'mappers/pmsi'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
+import { getPMSITab } from 'utils/tabsUtils'
 
 type PMSIListProps = {
-  groupId?: string
   deidentified?: boolean
 }
 
-const PMSIList = ({ groupId, deidentified }: PMSIListProps) => {
+const PMSIList = ({ deidentified }: PMSIListProps) => {
   const [toggleFilterByModal, setToggleFilterByModal] = useState(false)
   const [toggleSaveFiltersModal, setToggleSaveFiltersModal] = useState(false)
   const [toggleSavedFiltersModal, setToggleSavedFiltersModal] = useState(false)
@@ -57,11 +57,11 @@ const PMSIList = ({ groupId, deidentified }: PMSIListProps) => {
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
+  const tabId = searchParams.get('tabId') ?? undefined
+  const existingParams = Object.fromEntries(searchParams.entries())
 
-  const [selectedTab, setSelectedTab] = useState<PmsiTab>({
-    id: ResourceType.CONDITION,
-    label: PMSILabel.DIAGNOSTIC
-  })
+  const [selectedTab, setSelectedTab] = useState<PmsiTab>(getPMSITab(tabId))
   const sourceType = mapToSourceType(selectedTab.id)
 
   const [page, setPage] = useState(getPageParam ? parseInt(getPageParam, 10) : 1)
@@ -215,9 +215,7 @@ const PMSIList = ({ groupId, deidentified }: PMSIListProps) => {
   ])
 
   useEffect(() => {
-    const updatedSearchParams = new URLSearchParams(searchParams)
-    updatedSearchParams.set('page', page.toString())
-    setSearchParams(updatedSearchParams)
+    setSearchParams(cleanSearchParams({ page: page.toString(), tabId: selectedTab.id, groupId: groupId }))
 
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
@@ -308,6 +306,7 @@ const PMSIList = ({ groupId, deidentified }: PMSIListProps) => {
                 active={selectedTab}
                 onchange={(value: PmsiTab) => {
                   setSelectedTab(value)
+                  setSearchParams({ ...existingParams, tabId: value.id })
                 }}
               />
             </Grid>
diff --git a/src/components/Dashboard/PatientList/PatientList.tsx b/src/components/Dashboard/PatientList/PatientList.tsx
index 10d9260b1..e75183ea6 100644
--- a/src/components/Dashboard/PatientList/PatientList.tsx
+++ b/src/components/Dashboard/PatientList/PatientList.tsx
@@ -49,18 +49,18 @@ import { ResourceType } from 'types/requestCriterias'
 import List from 'components/ui/List'
 import { useAppDispatch, useAppSelector } from 'state'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
 
 type PatientListProps = {
   total: number
-  groupId?: string
   deidentified?: boolean | null
 }
 
-const PatientList = ({ groupId, total, deidentified }: PatientListProps) => {
+const PatientList = ({ total, deidentified }: PatientListProps) => {
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
 
   const [toggleFilterByModal, setToggleFilterByModal] = useState(false)
   const [toggleSaveFiltersModal, setToggleSaveFiltersModal] = useState(false)
@@ -165,7 +165,7 @@ const PatientList = ({ groupId, total, deidentified }: PatientListProps) => {
   }, [genders, vitalStatuses, birthdatesRanges, orderBy, searchBy, searchInput, groupId])
 
   useEffect(() => {
-    setSearchParams({ page: page.toString() })
+    setSearchParams(cleanSearchParams({ page: page.toString(), groupId: groupId }))
 
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
diff --git a/src/components/Dashboard/Preview/Preview.tsx b/src/components/Dashboard/Preview/Preview.tsx
index 507ce4caa..2b27d4ced 100644
--- a/src/components/Dashboard/Preview/Preview.tsx
+++ b/src/components/Dashboard/Preview/Preview.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import React, { useContext, useEffect } from 'react'
 import {
   CircularProgress,
   Grid,
@@ -31,6 +31,8 @@ import displayDigit from 'utils/displayDigit'
 import { SimpleChartDataType, GenderRepartitionType, AgeRepartitionType, VisiteRepartitionType } from 'types'
 import LocationMap from 'components/Dashboard/Preview/LocationMap'
 import { AppConfig } from 'config'
+import { useSearchParams } from 'react-router-dom'
+import { getCleanGroupId } from 'utils/paginationUtils'
 
 const MAP_WARNING_PERSON_COUNT_THRESHOLD = 1000000
 
@@ -113,8 +115,14 @@ const Preview: React.FC<PreviewProps> = ({
 }) => {
   const { classes } = useStyles()
   const appConfig = useContext(AppConfig)
+  const [searchParams, setSearchParams] = useSearchParams()
+  const groupIds = searchParams.get('groupId') ?? undefined
   const { vitalStatusData, genderData } = getGenderRepartitionSimpleData(genderRepartitionMap)
 
+  useEffect(() => {
+    setSearchParams({ ...(groupIds && getCleanGroupId(groupIds) && { groupId: getCleanGroupId(groupIds) }) })
+  }, [])
+
   return (
     <Grid container direction="column" alignItems="center" className={classes.root}>
       <Grid container item justifyContent="space-between" alignItems="center">
diff --git a/src/components/Patient/PatientBiology/PatientBiology.tsx b/src/components/Patient/PatientBiology/PatientBiology.tsx
index 0fbae1ca8..a42bd3348 100644
--- a/src/components/Patient/PatientBiology/PatientBiology.tsx
+++ b/src/components/Patient/PatientBiology/PatientBiology.tsx
@@ -42,16 +42,13 @@ import EncounterStatusFilter from 'components/Filters/EncounterStatusFilter'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
 
-type PatientBiologyProps = {
-  groupId?: string
-}
-
-const PatientBiology = ({ groupId }: PatientBiologyProps) => {
+const PatientBiology = () => {
   const { classes } = useStyles()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
 
   const theme = useTheme()
   const isMd = useMediaQuery(theme.breakpoints.down('lg'))
@@ -166,9 +163,8 @@ const PatientBiology = ({ groupId }: PatientBiologyProps) => {
   }, [nda, loinc, anabio, startDate, endDate, executiveUnits, validatedStatus, orderBy, searchInput, encounterStatus])
 
   useEffect(() => {
-    const updatedSearchParams = new URLSearchParams(searchParams)
-    updatedSearchParams.set('page', page.toString())
-    setSearchParams(updatedSearchParams)
+    setSearchParams(cleanSearchParams({ page: page.toString(), groupId: groupId }))
+
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
 
diff --git a/src/components/Patient/PatientDocs/PatientDocs.tsx b/src/components/Patient/PatientDocs/PatientDocs.tsx
index 32d7a6f8d..93b59f682 100644
--- a/src/components/Patient/PatientDocs/PatientDocs.tsx
+++ b/src/components/Patient/PatientDocs/PatientDocs.tsx
@@ -24,7 +24,6 @@ import {
   SearchByTypes,
   FilterByDocumentStatus
 } from 'types/searchCriterias'
-import { PatientTypes } from 'types/patient'
 import Modal from 'components/ui/Modal'
 import Button from 'components/ui/Button'
 import Searchbar from 'components/ui/Searchbar'
@@ -51,12 +50,13 @@ import services from 'services/aphp'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
 
-const PatientDocs: React.FC<PatientTypes> = ({ groupId }) => {
+const PatientDocs = () => {
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
   const [toggleFilterByModal, setToggleFilterByModal] = useState(false)
   const [toggleSaveFiltersModal, setToggleSaveFiltersModal] = useState(false)
   const [toggleSavedFiltersModal, setToggleSavedFiltersModal] = useState(false)
@@ -190,9 +190,7 @@ const PatientDocs: React.FC<PatientTypes> = ({ groupId }) => {
   ])
 
   useEffect(() => {
-    const updatedSearchParams = new URLSearchParams(searchParams)
-    updatedSearchParams.set('page', page.toString())
-    setSearchParams(updatedSearchParams)
+    setSearchParams(cleanSearchParams({ page: page.toString(), groupId: groupId }))
 
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
diff --git a/src/components/Patient/PatientForms/MaternityForms/index.tsx b/src/components/Patient/PatientForms/MaternityForms/index.tsx
index ea6fad97d..8b5a9c71d 100644
--- a/src/components/Patient/PatientForms/MaternityForms/index.tsx
+++ b/src/components/Patient/PatientForms/MaternityForms/index.tsx
@@ -23,16 +23,16 @@ import services from 'services/aphp'
 import EncounterStatusFilter from 'components/Filters/EncounterStatusFilter'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
+import { useSearchParams } from 'react-router-dom'
+import { getCleanGroupId } from 'utils/paginationUtils'
 
-type PatientFormsProps = {
-  groupId?: string
-}
-
-const MaternityForm = ({ groupId }: PatientFormsProps) => {
+const MaternityForm = () => {
   const [toggleModal, setToggleModal] = useState(false)
 
   const dispatch = useAppDispatch()
+  const [searchParams, setSearchParams] = useSearchParams()
   const patient = useAppSelector((state) => state.patient)
+  const groupId = searchParams.get('groupId') ?? undefined
 
   const [loadingStatus, setLoadingStatus] = useState(LoadingStatus.FETCHING)
   const [questionnaires, setQuestionnaires] = useState<Questionnaire[]>([])
@@ -93,6 +93,8 @@ const MaternityForm = ({ groupId }: PatientFormsProps) => {
 
   useEffect(() => {
     setLoadingStatus(LoadingStatus.IDDLE)
+    setSearchParams({ ...(groupId && getCleanGroupId(groupId) && { groupId: getCleanGroupId(groupId) }) })
+
     fetch()
   }, [])
 
diff --git a/src/components/Patient/PatientForms/index.tsx b/src/components/Patient/PatientForms/index.tsx
index f3a2c7853..72ef6090a 100644
--- a/src/components/Patient/PatientForms/index.tsx
+++ b/src/components/Patient/PatientForms/index.tsx
@@ -4,10 +4,6 @@ import { BlockWrapper } from 'components/ui/Layout'
 import Select from 'components/ui/Searchbar/Select'
 import MaternityForm from './MaternityForms'
 
-type PatientFormsProps = {
-  groupId?: string
-}
-
 const formTypes = [
   {
     id: 'maternity',
@@ -15,7 +11,7 @@ const formTypes = [
   }
 ]
 
-const PatientForms = ({ groupId }: PatientFormsProps) => {
+const PatientForms = () => {
   const [formType, setFormType] = useState('maternity')
 
   return (
@@ -23,7 +19,7 @@ const PatientForms = ({ groupId }: PatientFormsProps) => {
       <BlockWrapper item xs={12} margin={'20px 0px 0px'}>
         <Select value={formType} label="Formulaire" items={formTypes} onchange={(newValue) => setFormType(newValue)} />
       </BlockWrapper>
-      {formType === 'maternity' && <MaternityForm groupId={groupId} />}
+      {formType === 'maternity' && <MaternityForm />}
     </Grid>
   )
 }
diff --git a/src/components/Patient/PatientImaging/PatientImaging.tsx b/src/components/Patient/PatientImaging/PatientImaging.tsx
index 4586a29e1..a0895cbc4 100644
--- a/src/components/Patient/PatientImaging/PatientImaging.tsx
+++ b/src/components/Patient/PatientImaging/PatientImaging.tsx
@@ -21,7 +21,6 @@ import SearchInput from 'components/ui/Searchbar/SearchInput'
 import { cancelPendingRequest } from 'utils/abortController'
 import { selectFiltersAsArray } from 'utils/filters'
 import { LoadingStatus } from 'types'
-import { PatientTypes } from 'types/patient'
 import { AlertWrapper } from 'components/ui/Alert'
 import { Direction, FilterKeys, ImagingFilters, Order } from 'types/searchCriterias'
 import { ResourceType } from 'types/requestCriterias'
@@ -36,12 +35,13 @@ import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
 import { AppConfig } from 'config'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
 
-const PatientImaging: React.FC<PatientTypes> = ({ groupId }) => {
+const PatientImaging = () => {
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
 
   const appConfig = useContext(AppConfig)
   const patient = useAppSelector((state) => state.patient)
@@ -151,9 +151,7 @@ const PatientImaging: React.FC<PatientTypes> = ({ groupId }) => {
   }, [nda, startDate, endDate, orderBy, searchInput, executiveUnits, modality, encounterStatus])
 
   useEffect(() => {
-    const updatedSearchParams = new URLSearchParams(searchParams)
-    updatedSearchParams.set('page', page.toString())
-    setSearchParams(updatedSearchParams)
+    setSearchParams(cleanSearchParams({ page: page.toString(), groupId: groupId }))
 
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
diff --git a/src/components/Patient/PatientMedication/PatientMedication.tsx b/src/components/Patient/PatientMedication/PatientMedication.tsx
index bcd95438e..06c478ee6 100644
--- a/src/components/Patient/PatientMedication/PatientMedication.tsx
+++ b/src/components/Patient/PatientMedication/PatientMedication.tsx
@@ -41,11 +41,8 @@ import EncounterStatusFilter from 'components/Filters/EncounterStatusFilter'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
-
-type PatientMedicationProps = {
-  groupId?: string
-}
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
+import { getMedicationTab } from 'utils/tabsUtils'
 
 type MedicationSearchResults = {
   deidentified: boolean
@@ -60,10 +57,13 @@ export const medicationTabs: MedicationTab[] = [
   { id: ResourceType.MEDICATION_ADMINISTRATION, label: MedicationLabel.ADMINISTRATION }
 ]
 
-const PatientMedication = ({ groupId }: PatientMedicationProps) => {
+const PatientMedication = () => {
   const { classes } = useStyles()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
+  const tabId = searchParams.get('tabId') ?? undefined
+  const existingParams = Object.fromEntries(searchParams.entries())
   const theme = useTheme()
   const isSm = useMediaQuery(theme.breakpoints.down('md'))
   const [toggleFilterByModal, setToggleFilterByModal] = useState(false)
@@ -81,10 +81,7 @@ const PatientMedication = ({ groupId }: PatientMedicationProps) => {
   const [page, setPage] = useState(getPageParam ? parseInt(getPageParam, 10) : 1)
   const [selectedTab, setSelectedTab] = useState<
     TabType<ResourceType.MEDICATION_ADMINISTRATION | ResourceType.MEDICATION_REQUEST, MedicationLabel>
-  >({
-    id: ResourceType.MEDICATION_REQUEST,
-    label: MedicationLabel.PRESCRIPTION
-  })
+  >(getMedicationTab(tabId))
   const [oldTabs, setOldTabs] = useState<MedicationTab | null>(null)
 
   const {
@@ -215,10 +212,7 @@ const PatientMedication = ({ groupId }: PatientMedicationProps) => {
 
   useEffect(() => {
     setOldTabs(selectedTab)
-
-    const updatedSearchParams = new URLSearchParams(searchParams)
-    updatedSearchParams.set('page', page.toString())
-    setSearchParams(updatedSearchParams)
+    setSearchParams(cleanSearchParams({ page: page.toString(), tabId: selectedTab.id, groupId: groupId }))
 
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
@@ -301,6 +295,7 @@ const PatientMedication = ({ groupId }: PatientMedicationProps) => {
             ) => {
               setOldTabs(selectedTab)
               setSelectedTab(value)
+              setSearchParams({ ...existingParams, tabId: value.id })
             }}
           />
         </Grid>
diff --git a/src/components/Patient/PatientPMSI/PatientPMSI.tsx b/src/components/Patient/PatientPMSI/PatientPMSI.tsx
index 727872813..84700a02c 100644
--- a/src/components/Patient/PatientPMSI/PatientPMSI.tsx
+++ b/src/components/Patient/PatientPMSI/PatientPMSI.tsx
@@ -8,7 +8,7 @@ import DataTablePmsi from 'components/DataTable/DataTablePmsi'
 
 import { useAppSelector, useAppDispatch } from 'state'
 import { fetchPmsi } from 'state/patient'
-import { CohortPMSI, LoadingStatus, PmsiTab, PmsiTabs } from 'types'
+import { CohortPMSI, LoadingStatus, PmsiTab } from 'types'
 import useStyles from './styles'
 import { cancelPendingRequest } from 'utils/abortController'
 import { CanceledError } from 'axios'
@@ -41,11 +41,8 @@ import EncounterStatusFilter from 'components/Filters/EncounterStatusFilter'
 import { AlertWrapper } from 'components/ui/Alert'
 import { Hierarchy } from 'types/hierarchy'
 import { useSearchParams } from 'react-router-dom'
-import { checkIfPageAvailable, handlePageError } from 'utils/paginationUtils'
-
-type PatientPMSIProps = {
-  groupId?: string
-}
+import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
+import { getPMSITab } from 'utils/tabsUtils'
 
 type PmsiSearchResults = {
   deidentified: boolean
@@ -55,16 +52,19 @@ type PmsiSearchResults = {
   label: PMSILabel
 }
 
-export const PMSITabs: PmsiTabs = [
+export const PMSITabs: PmsiTab[] = [
   { label: PMSILabel.DIAGNOSTIC, id: ResourceType.CONDITION },
   { label: PMSILabel.CCAM, id: ResourceType.PROCEDURE },
   { label: PMSILabel.GHM, id: ResourceType.CLAIM }
 ]
 
-const PatientPMSI = ({ groupId }: PatientPMSIProps) => {
+const PatientPMSI = () => {
   const { classes } = useStyles()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
+  const groupId = searchParams.get('groupId') ?? undefined
+  const tabId = searchParams.get('tabId') ?? undefined
+  const existingParams = Object.fromEntries(searchParams.entries())
 
   const [toggleFilterByModal, setToggleFilterByModal] = useState(false)
   const [toggleSaveFiltersModal, setToggleSaveFiltersModal] = useState(false)
@@ -75,10 +75,7 @@ const PatientPMSI = ({ groupId }: PatientPMSIProps) => {
   const [encounterStatusList, setEncounterStatusList] = useState<Hierarchy<any, any>[]>([])
   const dispatch = useAppDispatch()
 
-  const [selectedTab, setSelectedTab] = useState<PmsiTab>({
-    id: ResourceType.CONDITION,
-    label: PMSILabel.DIAGNOSTIC
-  })
+  const [selectedTab, setSelectedTab] = useState<PmsiTab>(getPMSITab(tabId))
   const [oldTabs, setOldTabs] = useState<PmsiTab | null>(null)
 
   const sourceType = mapToSourceType(selectedTab.id)
@@ -193,9 +190,7 @@ const PatientPMSI = ({ groupId }: PatientPMSIProps) => {
   useEffect(() => {
     setOldTabs(selectedTab)
 
-    const updatedSearchParams = new URLSearchParams(searchParams)
-    updatedSearchParams.set('page', page.toString())
-    setSearchParams(updatedSearchParams)
+    setSearchParams(cleanSearchParams({ page: page.toString(), tabId: selectedTab.id, groupId: groupId }))
 
     handlePageError(page, setPage, dispatch, setLoadingStatus)
   }, [page])
@@ -298,6 +293,7 @@ const PatientPMSI = ({ groupId }: PatientPMSIProps) => {
                 onchange={(value: PmsiTab) => {
                   setOldTabs(selectedTab)
                   setSelectedTab(value)
+                  setSearchParams({ ...existingParams, tabId: value.id })
                 }}
               />
             </Grid>
diff --git a/src/components/Patient/PatientPreview/PatientPreview.tsx b/src/components/Patient/PatientPreview/PatientPreview.tsx
index 87be50c9b..e1dd1e79d 100644
--- a/src/components/Patient/PatientPreview/PatientPreview.tsx
+++ b/src/components/Patient/PatientPreview/PatientPreview.tsx
@@ -1,10 +1,12 @@
-import React from 'react'
+import React, { useEffect } from 'react'
+import { useSearchParams } from 'react-router-dom'
 
 import { Grid, Paper } from '@mui/material'
 
 import PatientField from './PatientField/PatientField'
 
 import { getAge } from 'utils/age'
+import { getCleanGroupId } from 'utils/paginationUtils'
 import { getLastDiagnosisLabels } from 'utils/pmsi'
 import { CohortPatient, IPatientDetails } from 'types'
 
@@ -16,6 +18,12 @@ type PatientPreviewProps = {
 }
 const PatientPreview: React.FC<PatientPreviewProps> = ({ patient, deidentifiedBoolean }) => {
   const { classes } = useStyles()
+  const [searchParams, setSearchParams] = useSearchParams()
+  const groupId = searchParams.get('groupId') ?? undefined
+
+  useEffect(() => {
+    setSearchParams({ ...(groupId && getCleanGroupId(groupId) && { groupId: getCleanGroupId(groupId) }) })
+  }, [])
 
   if (!patient) return <></>
 
diff --git a/src/components/Patient/PatientSidebar/PatientSidebar.tsx b/src/components/Patient/PatientSidebar/PatientSidebar.tsx
index aa55d63e4..5e2a9bbf1 100644
--- a/src/components/Patient/PatientSidebar/PatientSidebar.tsx
+++ b/src/components/Patient/PatientSidebar/PatientSidebar.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react'
-import { useLocation } from 'react-router-dom'
+import { useSearchParams } from 'react-router-dom'
 
 import { Divider, Drawer, Grid, IconButton, Typography } from '@mui/material'
 import { ChevronRight, Sort } from '@mui/icons-material'
@@ -7,6 +7,7 @@ import FilterList from 'assets/icones/filter.svg?react'
 
 import { selectFiltersAsArray } from 'utils/filters'
 import { cancelPendingRequest } from 'utils/abortController'
+import { getCleanGroupId } from 'utils/paginationUtils'
 import services from 'services/aphp'
 import { CohortPatient, DTTB_ResultsType as ResultsType, LoadingStatus } from 'types'
 
@@ -52,6 +53,7 @@ type PatientSidebarProps = {
 
 const PatientSidebar = ({ total, patients, openDrawer, onClose, deidentifiedBoolean }: PatientSidebarProps) => {
   const { classes } = useStyles()
+  const [searchParams] = useSearchParams()
   const [toggleFiltersModal, setToggleFiltersModal] = useState(false)
   const [toggleSortModal, setToggleSortModal] = useState(false)
   const [page, setPage] = useState(1)
@@ -76,9 +78,7 @@ const PatientSidebar = ({ total, patients, openDrawer, onClose, deidentifiedBool
 
   const controllerRef = useRef<AbortController | null>(null)
 
-  const location = useLocation()
-  const { search } = location
-  const groupId = new URLSearchParams(search).get('groupId') ?? ''
+  const groupId = getCleanGroupId(searchParams.get('groupId')) ?? undefined
 
   const fetchPatients = async () => {
     try {
diff --git a/src/components/Patient/PatientTimeline/PatientTimeline.tsx b/src/components/Patient/PatientTimeline/PatientTimeline.tsx
index ad84d4c6f..c0aebb92c 100644
--- a/src/components/Patient/PatientTimeline/PatientTimeline.tsx
+++ b/src/components/Patient/PatientTimeline/PatientTimeline.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { useParams } from 'react-router-dom'
+import { useParams, useSearchParams } from 'react-router-dom'
 import moment from 'moment'
 
 import Chip from 'components/ui/Chip'
@@ -32,6 +32,7 @@ import { FilterKeys, LabelObject } from 'types/searchCriterias'
 import { Hierarchy } from 'types/hierarchy'
 import { getExtension } from 'utils/fhir'
 import { getConfig } from 'config'
+import { getCleanGroupId } from 'utils/paginationUtils'
 
 const dateFormat = 'YYYY-MM-DD'
 
@@ -161,6 +162,7 @@ const PatientTimeline: React.FC<PatientTimelineTypes> = ({
 }) => {
   const dispatch = useAppDispatch()
   const { classes } = useStyles({})
+  const [searchParams, setSearchParams] = useSearchParams()
   const [timelineData, setTimelineData] = useState<TimelineData>({})
   const [openHospitDialog, setOpenHospitDialog] = useState(false)
   const [dialogDocuments, setDialogDocuments] = useState<CohortComposition[] | undefined>([])
@@ -174,12 +176,13 @@ const PatientTimeline: React.FC<PatientTimelineTypes> = ({
   const [loading, setLoading] = useState(false)
   const yearComponentSize: { [year: number]: number } = {}
 
-  const search = new URLSearchParams(location.search)
-  const groupId = search.get('groupId') ?? undefined
+  const groupId = searchParams.get('groupId') ?? undefined
 
   const { patientId } = useParams<{ patientId: string }>()
 
   useEffect(() => {
+    setSearchParams({ ...(groupId && getCleanGroupId(groupId) && { groupId: getCleanGroupId(groupId) }) })
+
     dispatch(
       fetchAllProcedures({
         // @ts-ignore
diff --git a/src/components/Requests/ProjectsTable/VersionRow/index.tsx b/src/components/Requests/ProjectsTable/VersionRow/index.tsx
index c866b6251..a873a7079 100644
--- a/src/components/Requests/ProjectsTable/VersionRow/index.tsx
+++ b/src/components/Requests/ProjectsTable/VersionRow/index.tsx
@@ -95,7 +95,16 @@ const VersionRow: React.FC<{ requestId: string; cohortsList: Cohort[] }> = ({ re
                 <TableRow key={cohort.uuid}>
                   <TableCellWrapper align="left" className={classes.tdName}>
                     {cohort.group_id ? (
-                      <Link onClick={() => navigate(`/cohort/${cohort.group_id}`)} underline="hover">
+                      <Link
+                        onClick={() => {
+                          const searchParams = new URLSearchParams()
+                          if (cohort.group_id) {
+                            searchParams.set('groupId', cohort.group_id)
+                          }
+                          navigate(`/cohort?${searchParams.toString()}`)
+                        }}
+                        underline="hover"
+                      >
                         {cohort.name}
                       </Link>
                     ) : (
diff --git a/src/components/Routes/AppNavigation/config.tsx b/src/components/Routes/AppNavigation/config.tsx
index 24fd76cb2..8b8358826 100644
--- a/src/components/Routes/AppNavigation/config.tsx
+++ b/src/components/Routes/AppNavigation/config.tsx
@@ -147,16 +147,16 @@ const configRoutes: configRoute[] = [
   {
     exact: true,
     displaySideBar: true,
-    path: '/cohort/:cohortId/:tabName',
-    name: 'cohort/:cohortId/:tabName',
+    path: '/cohort/:tabName',
+    name: 'cohort/:tabName',
     isPrivate: true,
     element: <Dashboard context={'cohort'} />
   },
   {
     exact: true,
     displaySideBar: true,
-    path: '/cohort/:cohortId',
-    name: 'cohort/:cohortId',
+    path: '/cohort',
+    name: 'cohort',
     isPrivate: true,
     element: <Dashboard context={'cohort'} />
   },
diff --git a/src/state/exploredCohort.ts b/src/state/exploredCohort.ts
index 4622c55ab..d2a585783 100644
--- a/src/state/exploredCohort.ts
+++ b/src/state/exploredCohort.ts
@@ -90,7 +90,7 @@ const fetchExploredCohort = createAsyncThunk<
       const statePerimeterIds =
         stateCohort &&
         Array.isArray(stateCohort) &&
-        (stateCohort.map((group) => group.id).filter((id) => id !== undefined) as string[])
+        stateCohort.map((group) => group.id).filter((id) => id !== undefined)
 
       shouldRefreshData =
         !statePerimeterIds ||
diff --git a/src/state/patient.ts b/src/state/patient.ts
index 8def8e934..f90916ef2 100644
--- a/src/state/patient.ts
+++ b/src/state/patient.ts
@@ -70,6 +70,7 @@ export type Pmsi = {
 export type PatientState = null | {
   loading: boolean
   deidentified?: boolean
+  groupId?: string
   patientInfo?: IPatientDetails
   hospits?: {
     loading: boolean
@@ -865,6 +866,7 @@ type FetchPatientReturn = {
     lastEncounter?: Encounter
   }
   deidentified?: boolean
+  groupId?: string
   hospits?: {
     loading: boolean
     list: (CohortEncounter | Encounter)[]
@@ -877,7 +879,12 @@ const fetchPatientInfo = createAsyncThunk<FetchPatientReturn, FetchPatientParams
     try {
       const patientState = getState().patient
 
-      if (patientState && patientState.patientInfo && patientState.patientInfo.id === patientId) {
+      if (
+        patientState &&
+        patientState.patientInfo &&
+        patientState.patientInfo.id === patientId &&
+        patientState.groupId === groupId
+      ) {
         return {
           patientInfo: patientState.patientInfo,
           deidentified: patientState.deidentified,
@@ -932,7 +939,8 @@ const fetchPatientInfo = createAsyncThunk<FetchPatientReturn, FetchPatientParams
         hospits: {
           loading: false,
           list: hospits ?? []
-        }
+        },
+        groupId: groupId
       }
     } catch (error) {
       console.error(error)
@@ -982,6 +990,7 @@ const patientSlice = createSlice({
             ...state,
             loading: false,
             deidentified: action.payload.deidentified,
+            groupId: action.payload.groupId,
             patientInfo: {
               ...(state?.patientInfo ?? {}),
               ...action.payload.patientInfo
@@ -992,6 +1001,7 @@ const patientSlice = createSlice({
             ...state,
             loading: false,
             deidentified: action.payload.deidentified,
+            groupId: action.payload.groupId,
             patientInfo: {
               ...state?.patientInfo,
               ...action.payload.patientInfo
diff --git a/src/types.ts b/src/types.ts
index 42d5befe2..5b15b1ad7 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -709,8 +709,6 @@ export type TabType<T, TL> = {
 
 export type PmsiTab = TabType<PMSIResourceTypes, PMSILabel>
 
-export type PmsiTabs = PmsiTab[]
-
 export type MedicationTab = TabType<
   ResourceType.MEDICATION_ADMINISTRATION | ResourceType.MEDICATION_REQUEST,
   MedicationLabel
diff --git a/src/types/patient.ts b/src/types/patient.ts
index 4e2f66dd7..99bf05f26 100644
--- a/src/types/patient.ts
+++ b/src/types/patient.ts
@@ -1,7 +1,3 @@
-export type PatientTypes = {
-  groupId?: string
-}
-
 export enum PatientTableLabels {
   GENDER = 'Sexe',
   FIRSTNAME = 'Prénom',
diff --git a/src/utils/paginationUtils.ts b/src/utils/paginationUtils.ts
index 95b431857..c231a3d44 100644
--- a/src/utils/paginationUtils.ts
+++ b/src/utils/paginationUtils.ts
@@ -45,3 +45,24 @@ export const handlePageError = (
     setLoadingStatus(LoadingStatus.IDDLE)
   }
 }
+
+export const getCleanGroupId = (groupId: string | null) => {
+  if (groupId === null) return undefined
+  const cleanGroupId = groupId.split(',').filter((value) => !!value && RegExp(/^\d+$/).exec(value))
+
+  return cleanGroupId.length > 0 ? cleanGroupId.join() : undefined
+}
+
+type cleanSearchParamsProps = {
+  page: string
+  tabId?: string
+  groupId?: string
+}
+export const cleanSearchParams = (params: cleanSearchParamsProps) => {
+  const { page, tabId, groupId } = params
+  return {
+    ...(groupId && getCleanGroupId(groupId) && { groupId: getCleanGroupId(groupId) }),
+    page: page,
+    ...(tabId && { tabId })
+  }
+}
diff --git a/src/utils/tabsUtils.ts b/src/utils/tabsUtils.ts
new file mode 100644
index 000000000..13eb15db3
--- /dev/null
+++ b/src/utils/tabsUtils.ts
@@ -0,0 +1,22 @@
+import { medicationTabs } from 'components/Patient/PatientMedication/PatientMedication'
+import { PMSITabs } from 'components/Patient/PatientPMSI/PatientPMSI'
+import { PMSILabel } from 'types/patient'
+import { MedicationLabel, ResourceType } from 'types/requestCriterias'
+
+export const getPMSITab = (tabId?: string) => {
+  return (
+    PMSITabs.find((tab) => tab.id.toLocaleLowerCase() === tabId?.toLocaleLowerCase()) ?? {
+      id: ResourceType.CONDITION,
+      label: PMSILabel.DIAGNOSTIC
+    }
+  )
+}
+
+export const getMedicationTab = (tabId?: string) => {
+  return (
+    medicationTabs.find((tab) => tab.id.toLocaleLowerCase() === tabId?.toLocaleLowerCase()) ?? {
+      id: ResourceType.MEDICATION_REQUEST,
+      label: MedicationLabel.PRESCRIPTION
+    }
+  )
+}
diff --git a/src/views/Dashboard/Dashboard.tsx b/src/views/Dashboard/Dashboard.tsx
index d7925e771..06dfad30d 100644
--- a/src/views/Dashboard/Dashboard.tsx
+++ b/src/views/Dashboard/Dashboard.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useContext } from 'react'
-import { Link, useParams, useLocation } from 'react-router-dom'
+import { Link, useLocation, useParams, useSearchParams } from 'react-router-dom'
 import { Grid, Tabs, Tab } from '@mui/material'
 
 import CohortPreview from 'components/Dashboard/Preview/Preview'
@@ -22,15 +22,15 @@ import PMSIList from 'components/Dashboard/PMSIList'
 import MedicationList from 'components/Dashboard/MedicationList'
 import BiologyList from 'components/Dashboard/BiologyList'
 import FormsList from 'components/Dashboard/FormsList'
+import { getCleanGroupId } from 'utils/paginationUtils'
 
-type Tabs = { label: string; value: string; to: string; disabled: boolean | undefined } | undefined
+type Tabs = { label: string; value: string; to: string; disabled?: boolean } | undefined
 
 const Dashboard: React.FC<{
   context: 'patients' | 'cohort' | 'perimeters' | 'new_cohort'
 }> = ({ context }) => {
-  const { cohortId, tabName } = useParams<{
-    cohortId?: string | undefined
-    tabName?: string | undefined
+  const { tabName } = useParams<{
+    tabName?: string
   }>()
 
   const dispatch = useAppDispatch()
@@ -40,9 +40,10 @@ const Dashboard: React.FC<{
   const ODD_IMAGING = appConfig.features.imaging.enabled
   const ODD_QUESTIONNAIRES = appConfig.features.questionnaires.enabled
 
-  const perimetreIds = location.search.substr(1)
+  const [searchParams] = useSearchParams()
+  const groupIds = getCleanGroupId(searchParams.get('groupId'))
 
-  const [selectedTab, selectTab] = useState(tabName || 'preview')
+  const [selectedTab, setSelectedTab] = useState(tabName ?? 'preview')
   const [tabs, setTabs] = useState<Tabs[]>([])
 
   const open = useAppSelector((state) => state.drawer)
@@ -54,17 +55,15 @@ const Dashboard: React.FC<{
       case 'patients':
         setTabs([
           // { label: 'Création cohorte', value: 'creation', to: `/cohort/new`, disabled: true },
-          { label: 'Aperçu', value: 'preview', to: '/my-patients/preview', disabled: false },
-          { label: 'Patients', value: 'patients', to: '/my-patients/patients', disabled: false },
-          { label: 'Documents', value: 'documents', to: '/my-patients/documents', disabled: false },
-          { label: 'PMSI', value: 'pmsi', to: '/my-patients/pmsi', disabled: false },
-          { label: 'Médicaments', value: 'medication', to: '/my-patients/medication', disabled: false },
-          { label: 'Biologie', value: 'biology', to: '/my-patients/biology', disabled: false },
-          ...(ODD_IMAGING
-            ? [{ label: 'Imagerie', value: 'imaging', to: '/my-patients/imaging', disabled: false }]
-            : []),
+          { label: 'Aperçu', value: 'preview', to: '/my-patients/preview' },
+          { label: 'Patients', value: 'patients', to: '/my-patients/patients' },
+          { label: 'Documents', value: 'documents', to: '/my-patients/documents' },
+          { label: 'PMSI', value: 'pmsi', to: '/my-patients/pmsi' },
+          { label: 'Médicaments', value: 'medication', to: '/my-patients/medication' },
+          { label: 'Biologie', value: 'biology', to: '/my-patients/biology' },
+          ...(ODD_IMAGING ? [{ label: 'Imagerie', value: 'imaging', to: '/my-patients/imaging' }] : []),
           ...(ODD_QUESTIONNAIRES && !dashboard.deidentifiedBoolean
-            ? [{ label: 'Formulaires', value: 'forms', to: `/my-patients/forms`, disabled: false }]
+            ? [{ label: 'Formulaires', value: 'forms', to: `/my-patients/forms` }]
             : [])
         ])
         break
@@ -73,20 +72,21 @@ const Dashboard: React.FC<{
           {
             label: 'Modifier la requête',
             value: 'creation',
-            to: `/cohort/new/${dashboard.requestId}/${dashboard.snapshotId}`,
-            disabled: false
+            to: `/cohort/new/${dashboard.requestId}/${dashboard.snapshotId}`
           },
-          { label: 'Aperçu cohorte', value: 'preview', to: `/cohort/${cohortId}/preview`, disabled: false },
-          { label: 'Données patient', value: 'patients', to: `/cohort/${cohortId}/patients`, disabled: false },
-          { label: 'Documents cliniques', value: 'documents', to: `/cohort/${cohortId}/documents`, disabled: false },
-          { label: 'PMSI', value: 'pmsi', to: `/cohort/${cohortId}/pmsi`, disabled: false },
-          { label: 'Médicaments', value: 'medication', to: `/cohort/${cohortId}/medication`, disabled: false },
-          { label: 'Biologie', value: 'biology', to: `/cohort/${cohortId}/biology`, disabled: false },
-          ...(ODD_IMAGING
-            ? [{ label: 'Imagerie', value: 'imaging', to: `/cohort/${cohortId}/imaging`, disabled: false }]
-            : []),
+          { label: 'Aperçu cohorte', value: 'preview', to: `/cohort/preview?groupId=${groupIds}` },
+          { label: 'Données patient', value: 'patients', to: `/cohort/patients${location.search}` },
+          {
+            label: 'Documents cliniques',
+            value: 'documents',
+            to: `/cohort/documents${location.search}`
+          },
+          { label: 'PMSI', value: 'pmsi', to: `/cohort/pmsi${location.search}` },
+          { label: 'Médicaments', value: 'medication', to: `/cohort/medication${location.search}` },
+          { label: 'Biologie', value: 'biology', to: `/cohort/biology${location.search}` },
+          ...(ODD_IMAGING ? [{ label: 'Imagerie', value: 'imaging', to: `/cohort/imaging${location.search}` }] : []),
           ...(ODD_QUESTIONNAIRES && !dashboard.deidentifiedBoolean
-            ? [{ label: 'Formulaires', value: 'forms', to: `/cohort/${cohortId}/forms`, disabled: false }]
+            ? [{ label: 'Formulaires', value: 'forms', to: `/cohort/forms${location.search}` }]
             : [])
         ])
         break
@@ -96,66 +96,66 @@ const Dashboard: React.FC<{
           { label: 'Aperçu cohorte', value: 'preview', to: `/cohort/new/preview`, disabled: true },
           { label: 'Données patient', value: 'patients', to: `/cohort/new/patients`, disabled: true },
           { label: 'Documents cliniques', value: 'documents', to: `/cohort/new/documents`, disabled: true },
-          { label: 'PMSI', value: 'pmsi', to: `/cohort/new/pmsi`, disabled: false },
-          { label: 'Médicaments', value: 'medication', to: `/cohort/new/medication`, disabled: false },
-          { label: 'Biologie', value: 'biology', to: `/cohort/new/biology`, disabled: false },
+          { label: 'PMSI', value: 'pmsi', to: `/cohort/new/pmsi` },
+          { label: 'Médicaments', value: 'medication', to: `/cohort/new/medication` },
+          { label: 'Biologie', value: 'biology', to: `/cohort/new/biology` },
           ...(ODD_IMAGING ? [{ label: 'Imagerie', value: 'imaging', to: `/cohort/new/imaging`, disabled: true }] : []),
           ...(ODD_QUESTIONNAIRES && !dashboard.deidentifiedBoolean
-            ? [{ label: 'Formulaires', value: 'forms', to: `/cohort/new/forms`, disabled: false }]
+            ? [{ label: 'Formulaires', value: 'forms', to: `/cohort/new/forms` }]
             : [])
         ])
         break
-      case 'perimeters':
+      case 'perimeters': {
         setTabs([
           // { label: 'Création cohorte', value: 'creation', to: `/cohort/new`, disabled: true },
-          { label: 'Aperçu', value: 'preview', to: `/perimeters/preview${location.search}`, disabled: false },
+          { label: 'Aperçu', value: 'preview', to: `/perimeters/preview?groupId=${groupIds}` },
           {
             label: 'Données patient',
             value: 'patients',
-            to: `/perimeters/patients${location.search}`,
-            disabled: false
+            to: `/perimeters/patients${location.search}`
           },
           {
             label: 'Documents cliniques',
             value: 'documents',
-            to: `/perimeters/documents${location.search}`,
-            disabled: false
+            to: `/perimeters/documents${location.search}`
+          },
+          { label: 'PMSI', value: 'pmsi', to: `/perimeters/pmsi${location.search}` },
+          {
+            label: 'Médicaments',
+            value: 'medication',
+            to: `/perimeters/medication${location.search}`
           },
-          { label: 'PMSI', value: 'pmsi', to: `/perimeters/pmsi${location.search}`, disabled: false },
-          { label: 'Médicaments', value: 'medication', to: `/perimeters/new/medication`, disabled: false },
-          { label: 'Biologie', value: 'biology', to: `/perimeters/biology${location.search}`, disabled: false },
+          { label: 'Biologie', value: 'biology', to: `/perimeters/biology${location.search}` },
           ...(ODD_IMAGING
-            ? [{ label: 'Imagerie', value: 'imaging', to: `/perimeters/imaging${location.search}`, disabled: false }]
+            ? [{ label: 'Imagerie', value: 'imaging', to: `/perimeters/imaging${location.search}` }]
             : []),
           ...(ODD_QUESTIONNAIRES && !dashboard.deidentifiedBoolean
-            ? [{ label: 'Formulaires', value: 'forms', to: `/perimeters/forms${location.search}`, disabled: false }]
+            ? [{ label: 'Formulaires', value: 'forms', to: `/perimeters/forms${location.search}` }]
             : [])
         ])
         break
+      }
       default:
         break
     }
   }
 
   useEffect(() => {
-    const id = context === 'cohort' ? cohortId : context === 'perimeters' ? perimetreIds : undefined
-
     if (context !== 'new_cohort') {
-      dispatch(fetchExploredCohort({ context, id }))
+      dispatch(fetchExploredCohort({ context, id: groupIds }))
     }
-  }, [context, cohortId]) // eslint-disable-line
+  }, [context, groupIds]) // eslint-disable-line
 
   useEffect(() => {
     onChangeTabs()
   }, [dashboard])
 
   const forceReload = () => {
-    const id = context === 'cohort' ? cohortId : context === 'perimeters' ? perimetreIds : undefined
-    dispatch(fetchExploredCohort({ context, id, forceReload: true }))
+    dispatch(fetchExploredCohort({ context, id: groupIds, forceReload: true }))
   }
 
   const handleChangeTabs = (event: React.SyntheticEvent<Element, Event>, newTab: string) => {
-    selectTab(newTab)
+    setSelectedTab(newTab)
   }
 
   if (context === 'new_cohort') {
@@ -168,8 +168,6 @@ const Dashboard: React.FC<{
     return <CohortNoPatient />
   }
 
-  const groupId = context !== 'patients' ? cohortId ?? perimetreIds : undefined
-
   return (
     <Grid
       container
@@ -194,22 +192,21 @@ const Dashboard: React.FC<{
       <Grid container justifyContent="center" className={classes.tabs}>
         <Grid container item xs={11}>
           <Tabs value={selectedTab} onChange={handleChangeTabs} classes={{ indicator: classes.indicator }}>
-            {tabs &&
-              tabs.map(
-                (tab) =>
-                  tab && (
-                    <Tab
-                      disabled={tab.disabled}
-                      classes={{ selected: classes.selected }}
-                      className={classes.tabTitle}
-                      label={tab.label}
-                      value={tab.value}
-                      component={Link}
-                      to={tab.to}
-                      key={tab.value}
-                    />
-                  )
-              )}
+            {tabs.map(
+              (tab) =>
+                tab && (
+                  <Tab
+                    disabled={tab.disabled}
+                    classes={{ selected: classes.selected }}
+                    className={classes.tabTitle}
+                    label={tab.label}
+                    value={tab.value}
+                    component={Link}
+                    to={tab.to}
+                    key={tab.value}
+                  />
+                )
+            )}
           </Tabs>
         </Grid>
       </Grid>
@@ -217,10 +214,8 @@ const Dashboard: React.FC<{
         {selectedTab === 'preview' && (
           <CohortPreview
             cohortId={
-              context === 'cohort'
-                ? cohortId
-                : context === 'perimeters'
-                ? perimetreIds
+              context === 'cohort' || context === 'perimeters'
+                ? groupIds
                 : context === 'patients'
                 ? me?.topLevelCareSites?.join(',')
                 : undefined
@@ -234,28 +229,15 @@ const Dashboard: React.FC<{
           />
         )}
         {selectedTab === 'patients' && (
-          <PatientList
-            groupId={groupId}
-            total={dashboard.totalPatients || 0}
-            deidentified={dashboard.deidentifiedBoolean}
-          />
-        )}
-        {selectedTab === 'documents' && (
-          <Documents groupId={groupId} deidentified={dashboard.deidentifiedBoolean ?? false} />
-        )}
-        {selectedTab === 'pmsi' && <PMSIList groupId={groupId} deidentified={dashboard.deidentifiedBoolean ?? false} />}
-        {selectedTab === 'medication' && (
-          <MedicationList groupId={groupId} deidentified={dashboard.deidentifiedBoolean ?? false} />
-        )}
-        {selectedTab === 'biology' && (
-          <BiologyList groupId={groupId} deidentified={dashboard.deidentifiedBoolean ?? false} />
-        )}
-        {selectedTab === 'imaging' && (
-          <ImagingList groupId={groupId} deidentified={dashboard.deidentifiedBoolean ?? false} />
-        )}
-        {ODD_QUESTIONNAIRES && !dashboard.deidentifiedBoolean && selectedTab === 'forms' && (
-          <FormsList groupId={groupId} />
+          <PatientList total={dashboard.totalPatients ?? 0} deidentified={dashboard.deidentifiedBoolean} />
         )}
+
+        {selectedTab === 'documents' && <Documents deidentified={dashboard.deidentifiedBoolean ?? false} />}
+        {selectedTab === 'pmsi' && <PMSIList deidentified={dashboard.deidentifiedBoolean ?? false} />}
+        {selectedTab === 'medication' && <MedicationList deidentified={dashboard.deidentifiedBoolean ?? false} />}
+        {selectedTab === 'biology' && <BiologyList deidentified={dashboard.deidentifiedBoolean ?? false} />}
+        {selectedTab === 'imaging' && <ImagingList deidentified={dashboard.deidentifiedBoolean ?? false} />}
+        {ODD_QUESTIONNAIRES && !dashboard.deidentifiedBoolean && selectedTab === 'forms' && <FormsList />}
       </Grid>
     </Grid>
   )
diff --git a/src/views/Patient/Patient.tsx b/src/views/Patient/Patient.tsx
index 89586e42d..65de76973 100644
--- a/src/views/Patient/Patient.tsx
+++ b/src/views/Patient/Patient.tsx
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect, useState } from 'react'
-import { Link, useLocation, useParams } from 'react-router-dom'
+import { Link, useLocation, useParams, useSearchParams } from 'react-router-dom'
 import { IconButton, Grid, Tabs, Tab, CircularProgress } from '@mui/material'
 import ChevronLeftIcon from '@mui/icons-material/ChevronLeft'
 import PatientNotExist from 'components/ErrorView/PatientNotExist'
@@ -18,6 +18,7 @@ import useStyles from './styles'
 import { useAppSelector, useAppDispatch } from 'state'
 import { fetchPatientInfo } from 'state/patient'
 import { AppConfig } from 'config'
+import { getCleanGroupId } from 'utils/paginationUtils'
 
 const Patient = () => {
   const dispatch = useAppDispatch()
@@ -33,20 +34,16 @@ const Patient = () => {
   const ODD_BIOLOGY = config.features.observation.enabled
   const ODD_IMAGING = config.features.imaging.enabled
 
-  const search = new URLSearchParams(location.search)
-  const groupId = search.get('groupId') ?? undefined
+  const [searchParams] = useSearchParams()
+  const groupId = getCleanGroupId(searchParams.get('groupId'))
 
   const { patientId, tabName } = useParams<{
     patientId: string
     tabName: string
   }>()
 
-  const [selectedTab, selectTab] = useState('preview')
-  const [isSidebarOpened, setSidebarOpened] = useState(false)
-
-  useEffect(() => {
-    selectTab(tabName || 'preview')
-  }, [tabName])
+  const [selectedTab, setSelectedTab] = useState(tabName ?? 'preview')
+  const [isSidebarOpened, setIsSidebarOpened] = useState(false)
 
   useEffect(() => {
     const _fetchPatient = async () => {
@@ -67,7 +64,7 @@ const Patient = () => {
   }
 
   const handleChangeTabs = (event: React.SyntheticEvent<Element, Event>, newTab: string) => {
-    selectTab(newTab)
+    setSelectedTab(newTab)
   }
 
   return loading ? (
@@ -90,7 +87,7 @@ const Patient = () => {
       >
         {!isSidebarOpened && (
           <div className={classes.openLeftBar}>
-            <IconButton onClick={() => setSidebarOpened(true)}>
+            <IconButton onClick={() => setIsSidebarOpened(true)}>
               <ChevronLeftIcon color="action" width="20px" />
             </IconButton>
           </div>
@@ -105,28 +102,28 @@ const Patient = () => {
               label="Aperçu patient"
               value="preview"
               component={Link}
-              to={`/patients/${patientId}/preview${groupId ? `?groupId=${groupId}` : ''}`}
+              to={`/patients/${patientId}/preview${location.search}`}
             />
             <Tab
               className={classes.tabTitle}
               label="Parcours patient"
               value="timeline"
               component={Link}
-              to={`/patients/${patientId}/timeline${groupId ? `?groupId=${groupId}` : ''}`}
+              to={`/patients/${patientId}/timeline${location.search}`}
             />
             <Tab
               className={classes.tabTitle}
               label="Documents cliniques"
-              value="clinical-documents"
+              value="documents"
               component={Link}
-              to={`/patients/${patientId}/clinical-documents${groupId ? `?groupId=${groupId}` : ''}`}
+              to={`/patients/${patientId}/documents${location.search}`}
             />
             <Tab
               className={classes.tabTitle}
               label="PMSI"
               value="pmsi"
               component={Link}
-              to={`/patients/${patientId}/pmsi${groupId ? `?groupId=${groupId}` : ''}`}
+              to={`/patients/${patientId}/pmsi${location.search}`}
             />
             {ODD_MEDICATION && (
               <Tab
@@ -134,7 +131,7 @@ const Patient = () => {
                 label="Médicaments"
                 value="medication"
                 component={Link}
-                to={`/patients/${patientId}/medication${groupId ? `?groupId=${groupId}` : ''}`}
+                to={`/patients/${patientId}/medication${location.search}`}
               />
             )}
             {ODD_BIOLOGY && (
@@ -143,7 +140,7 @@ const Patient = () => {
                 label="Biologie"
                 value="biology"
                 component={Link}
-                to={`/patients/${patientId}/biology${groupId ? `?groupId=${groupId}` : ''}`}
+                to={`/patients/${patientId}/biology${location.search}`}
               />
             )}
             {ODD_IMAGING && (
@@ -152,7 +149,7 @@ const Patient = () => {
                 label="Imagerie"
                 value="imaging"
                 component={Link}
-                to={`/patients/${patientId}/imaging${groupId ? `?groupId=${groupId}` : ''}`}
+                to={`/patients/${patientId}/imaging${location.search}`}
               />
             )}
             {config.features.questionnaires.enabled && !deidentified && (
@@ -161,7 +158,7 @@ const Patient = () => {
                 label="Formulaires"
                 value="forms"
                 component={Link}
-                to={`/patients/${patientId}/forms${groupId ? `?groupId=${groupId}` : ''}`}
+                to={`/patients/${patientId}/forms${location.search}`}
               />
             )}
           </Tabs>
@@ -180,21 +177,19 @@ const Patient = () => {
               deidentified={deidentified}
             />
           )}
-          {selectedTab === 'clinical-documents' && <PatientDocs groupId={groupId} />}
-          {selectedTab === 'pmsi' && <PatientPMSI groupId={groupId} />}
-          {ODD_MEDICATION && selectedTab === 'medication' && <PatientMedication groupId={groupId} />}
-          {ODD_BIOLOGY && selectedTab === 'biology' && <PatientBiology groupId={groupId} />}
-          {ODD_IMAGING && selectedTab === 'imaging' && <PatientImaging groupId={groupId} />}
-          {config.features.questionnaires.enabled && selectedTab === 'forms' && !deidentified && (
-            <PatientForms groupId={groupId} />
-          )}
+          {selectedTab === 'documents' && <PatientDocs />}
+          {selectedTab === 'pmsi' && <PatientPMSI />}
+          {ODD_MEDICATION && selectedTab === 'medication' && <PatientMedication />}
+          {ODD_BIOLOGY && selectedTab === 'biology' && <PatientBiology />}
+          {ODD_IMAGING && selectedTab === 'imaging' && <PatientImaging />}
+          {config.features.questionnaires.enabled && selectedTab === 'forms' && !deidentified && <PatientForms />}
         </Grid>
 
         <PatientSidebar
           openDrawer={isSidebarOpened}
           patients={cohort.originalPatients}
           total={cohort.totalPatients ?? 0}
-          onClose={() => setSidebarOpened(false)}
+          onClose={() => setIsSidebarOpened(false)}
           deidentifiedBoolean={deidentified}
         />
       </Grid>
diff --git a/src/views/Scope/CareSiteView.tsx b/src/views/Scope/CareSiteView.tsx
index ca1e167d4..984c2d1e8 100644
--- a/src/views/Scope/CareSiteView.tsx
+++ b/src/views/Scope/CareSiteView.tsx
@@ -19,8 +19,9 @@ const CareSiteView = () => {
   const open = useAppSelector((state) => state.drawer)
 
   const handleNavigation = () => {
-    const perimetresIds = selectedCodes.map((code) => code.cohort_id ?? null)
-    navigate(`/perimeters?${perimetresIds}`)
+    const perimetresIds = selectedCodes.map((code) => code.cohort_id ?? null).filter(Boolean)
+    const searchParams = new URLSearchParams({ groupId: perimetresIds.join(',') }).toString()
+    navigate(`/perimeters?${searchParams}`)
   }
 
   useEffect(() => {