diff --git a/.gitignore b/.gitignore
index 349500c11..97963f95a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,5 @@ yarn-error.log*
 .env*
 !.env.example
 .mp4
-public/config.dev.json
\ No newline at end of file
+public/config.dev.json
+public/config.example.json
diff --git a/public/config.example.json b/public/config.example.json
new file mode 100644
index 000000000..980c5b5da
--- /dev/null
+++ b/public/config.example.json
@@ -0,0 +1,163 @@
+{
+    "core": {
+        "codeSystems": {
+            "docStatus": "http://hl7.org/fhir/CodeSystem/composition-status"
+        },
+        "extensions": {
+        },
+        "perimeterSourceTypeHierarchy": [
+            "hospital","hospital_depart","hospital_serv"
+        ],
+        "valueSets": {
+            "demographicGender": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-patient-genre"
+            },
+            "encounterAdmission": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-type-admission"
+            },
+            "encounterAdmissionMode": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-motif-admission"
+            },
+            "encounterDestination": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-destination"
+            },
+            "encounterEntryMode": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-mode-entree"
+            },
+            "encounterExitMode": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-mode-sortie"
+            },
+            "encounterExitType": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-type-sortie"
+            },
+            "encounterFileStatus": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-visite-status"
+            },
+            "encounterProvenance": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-provenance"
+            },
+            "encounterSejourType": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-type-sejour"
+            },
+            "encounterStatus": {
+                "url": "http://hl7.org/fhir/CodeSystem/encounter-status"
+            },
+            "encounterVisitType": {
+                "url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-type"
+            }
+        },
+        "fhir": {
+            "valueSetExploration": false,
+            "facetsExtensions": false,
+            "filterActive": false,
+            "totalCount": true,
+            "selectedCodeOnly": false,
+            "extraSearchParams": false,
+            "resourceLists": false,
+            "textSearch": false,
+            "valuesetExpansion": false
+        }
+    },
+    "features": {
+        "claim": {
+            "enabled": false
+        },
+        "cohort": {
+            "enabled": true,
+            "shortCohortLimit": 2000
+        },
+        "condition": {
+            "enabled": true,
+            "valueSets": {
+                "conditionHierarchy": {
+                    "url": "https://smt.esante.gouv.fr/terminologie-cim-10/"
+                },
+                "conditionStatus": {
+                    "url": "https://terminology.eds.aphp.fr/aphp-orbis-condition-status"
+                }
+            }
+        },
+        "contact": {
+            "enabled": false
+        },
+        "export": {
+            "enabled": false,
+            "exportLinesLimit": 300000
+        },
+        "feasabilityReport": {
+            "enabled": false
+        },
+        "imaging": {
+            "enabled": true,
+            "extensions": {},
+            "valueSets": {
+                "imagingModalities": {
+                    "url": "https://dicom.nema.org/medical/dicom/current/output/chtml/part16/sect_CID_33.html"
+                }
+            }
+        },
+        "locationMap": {
+            "enabled": false
+        },
+        "medication": {
+            "enabled": true,
+            "valueSets": {
+                "medicationAdministrations": {
+                    "url": "https://terminology.eds.aphp.fr/aphp-orbis-medicament-voie-administration"
+                },
+                "medicationAtc": {
+                    "url": "https://terminology.eds.aphp.fr/atc"
+                },
+                "medicationAtcOrbis": {
+                    "url": "https://terminology.eds.aphp.fr/aphp-orbis-medicament-atc-article"
+                },
+                "medicationPrescriptionTypes": {
+                    "url": "https://terminology.eds.aphp.fr/aphp-medicament-type-prescription"
+                },
+                "medicationUcd": {
+                    "url": "https://terminology.eds.aphp.fr/smt-medicament-ucd"
+                }
+            },
+            "useMedicationAtcUcdCodes": false
+        },
+        "observation": {
+            "enabled": true,
+            "valueSets": {
+                "biologyHierarchyAnabio": {
+                    "url": "https://terminology.eds.aphp.fr/aphp-itm-anabio"
+                },
+                "biologyHierarchyLoinc": {
+                    "url": "https://terminology.eds.aphp.fr/aphp-itm-loinc"
+                }
+            },
+            "useObservationValueRestriction": false,
+            "useObservationDefaultValidated": false
+        },
+        "procedure": {
+            "enabled": true,
+            "valueSets": {
+                "procedureHierarchy": {
+                    "url": "https://www.atih.sante.fr/plateformes-de-transmission-et-logiciels/logiciels-espace-de-telechargement/id_lot/3550"
+                }
+            }
+        },
+        "questionnaires": {
+            "enabled": false
+        }
+    },
+    "labels": {
+        "exploration": "Exploration"
+    },
+    "system": {
+        "codeDisplayJWT": "ArrowUp,ArrowUp,ArrowDown,ArrowDown,ArrowLeft,ArrowRight,ArrowLeft,ArrowRight,b,a,Enter",
+        "oidc": {
+            "clientId": "cohort360",
+            "issuer": "http://172.28.0.20:8080/realms/cohort/protocol/openid-connect/auth",
+            "redirectUri": "http://localhost:8003",
+            "responseType": "code",
+            "scope": "openid",
+            "state": "mlTPASu3bwdFmFUSK4G4ImecrsKW9pQ7SDdf7uB"
+        },
+        "wsProtocol": "ws://"
+    }
+}
diff --git a/src/components/CreationCohort/DataList_Criteria.tsx b/src/components/CreationCohort/DataList_Criteria.tsx
index e65ae7acf..3ed6dcb68 100644
--- a/src/components/CreationCohort/DataList_Criteria.tsx
+++ b/src/components/CreationCohort/DataList_Criteria.tsx
@@ -25,6 +25,7 @@ const criteriaList: () => CriteriaItemType[] = () => {
   const ODD_IMAGING = getConfig().features.imaging.enabled
   const ODD_MEDICATION = getConfig().features.medication.enabled
   const ODD_DOCUMENT_REFERENCE = getConfig().features.documentReference.enabled
+  const ODD_CLAIM = getConfig().features.claim.enabled
   return [
     {
       id: CriteriaType.REQUEST,
@@ -112,17 +113,22 @@ const criteriaList: () => CriteriaItemType[] = () => {
             encounterStatus: services.cohortCreation.fetchEncounterStatus
           }
         },
-        {
-          id: CriteriaType.CLAIM,
-          title: CriteriaTypeLabels.CLAIM,
-          color: '#0063AF',
-          fontWeight: 'normal',
-          components: GhmForm,
-          fetch: {
-            ghmData: services.cohortCreation.fetchGhmData,
-            encounterStatus: services.cohortCreation.fetchEncounterStatus
-          }
-        }
+        ...(ODD_CLAIM
+          ? [
+              {
+                id: CriteriaType.CLAIM,
+                title: CriteriaTypeLabels.CLAIM,
+                color: '#0063AF',
+                fontWeight: 'normal',
+                components: GhmForm,
+                fetch: {
+                  ghmData: services.cohortCreation.fetchGhmData,
+                  encounterStatus: services.cohortCreation.fetchEncounterStatus
+                },
+                disabled: !ODD_CLAIM
+              }
+            ]
+          : [])
       ]
     },
     {
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx
index 459cf14d1..685894a07 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx
@@ -32,10 +32,10 @@ export const defaultBiology: Omit<ObservationDataType, 'id'> = {
 
 const Index = (props: CriteriaDrawerComponentProps) => {
   const { criteriaData, selectedCriteria, onChangeSelectedCriteria, goBack } = props
-  const config = useContext(AppConfig)
+  const appConfig = useContext(AppConfig)
   const { classes } = useStyles()
   const [selectedTab, setSelectedTab] = useState<'form' | 'hierarchy' | 'search'>(
-    selectedCriteria ? 'form' : 'hierarchy'
+    selectedCriteria || !appConfig.core.fhir.valueSetExploration ? 'form' : 'hierarchy'
   )
   const [defaultCriteria, setDefaultCriteria] = useState<ObservationDataType>(
     (selectedCriteria as ObservationDataType) || defaultBiology
@@ -83,8 +83,8 @@ const Index = (props: CriteriaDrawerComponentProps) => {
         value={selectedTab}
         onChange={(e, tab) => setSelectedTab(tab)}
       >
-        <Tab label={config.labels.exploration} value="hierarchy" />
-        <Tab label="Recherche" value="search" />
+        {appConfig.core.fhir.valueSetExploration && <Tab label={appConfig.labels.exploration} value="hierarchy" />}
+        {appConfig.core.fhir.valueSetExploration && <Tab label="Recherche" value="search" />}
         <Tab label="Formulaire" value="form" />
       </Tabs>
 
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/index.tsx
index c395cf165..2427dfd9b 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CCAM/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 import { Tab, Tabs } from '@mui/material'
 
 import useStyles from './styles'
@@ -13,6 +13,7 @@ import { EXPLORATION } from '../../../../../../../..//constants'
 import { CriteriaDrawerComponentProps } from 'types'
 import { CcamDataType, Comparators, CriteriaType } from 'types/requestCriterias'
 import { Hierarchy } from 'types/hierarchy'
+import { AppConfig } from 'config'
 
 export const defaultProcedure: Omit<CcamDataType, 'id'> = {
   type: CriteriaType.PROCEDURE,
@@ -32,7 +33,10 @@ export const defaultProcedure: Omit<CcamDataType, 'id'> = {
 
 const Index = (props: CriteriaDrawerComponentProps) => {
   const { criteriaData, selectedCriteria, onChangeSelectedCriteria, goBack } = props
-  const [selectedTab, setSelectedTab] = useState<'form' | 'hierarchy'>(selectedCriteria ? 'form' : 'hierarchy')
+  const appConfig = useContext(AppConfig)
+  const [selectedTab, setSelectedTab] = useState<'form' | 'hierarchy'>(
+    selectedCriteria || !appConfig.core.fhir.valueSetExploration ? 'form' : 'hierarchy'
+  )
   const [defaultCriteria, setDefaultCriteria] = useState<CcamDataType>(
     (selectedCriteria as CcamDataType) || defaultProcedure
   )
@@ -81,7 +85,7 @@ const Index = (props: CriteriaDrawerComponentProps) => {
         value={selectedTab}
         onChange={(e, tab) => setSelectedTab(tab)}
       >
-        <Tab label={EXPLORATION} value="hierarchy" />
+        {appConfig.core.fhir.valueSetExploration && <Tab label={EXPLORATION} value="hierarchy" />}
         <Tab label="Formulaire" value="form" />
       </Tabs>
 
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Form/Cim10Form.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Form/Cim10Form.tsx
index f474e53a3..fef16b997 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Form/Cim10Form.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/components/Form/Cim10Form.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useContext, useState } from 'react'
 
 import {
   Alert,
@@ -31,6 +31,7 @@ import { BlockWrapper } from 'components/ui/Layout'
 import OccurenceInput from 'components/ui/Inputs/Occurences'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
+import { AppConfig } from 'config'
 
 type Cim10FormProps = {
   isOpen: boolean
@@ -50,7 +51,7 @@ enum Error {
 
 const Cim10Form: React.FC<Cim10FormProps> = (props) => {
   const { isOpen, isEdition, criteriaData, selectedCriteria, onChangeValue, onChangeSelectedCriteria, goBack } = props
-
+  const appConfig = useContext(AppConfig)
   const { classes } = useStyles()
   const dispatch = useAppDispatch()
   const initialState: HierarchyTree | null = useAppSelector((state) => state.syncHierarchyTable)
@@ -205,17 +206,19 @@ const Cim10Form: React.FC<Cim10FormProps> = (props) => {
               onChangeValue('code', value)
             }}
           />
-          <Autocomplete
-            multiple
-            id="criteria-cim10-type-autocomplete"
-            className={classes.inputItem}
-            options={criteriaData.data.diagnosticTypes || []}
-            getOptionLabel={(option) => option.label}
-            isOptionEqualToValue={(option, value) => option.id === value.id}
-            value={defaultValuesType}
-            onChange={(e, value) => onChangeValue('diagnosticType', value)}
-            renderInput={(params) => <TextField {...params} label="Type de diagnostic" />}
-          />
+          {appConfig.core.fhir.extraSearchParams && (
+            <Autocomplete
+              multiple
+              id="criteria-cim10-type-autocomplete"
+              className={classes.inputItem}
+              options={criteriaData.data.diagnosticTypes || []}
+              getOptionLabel={(option) => option.label}
+              isOptionEqualToValue={(option, value) => option.id === value.id}
+              value={defaultValuesType}
+              onChange={(e, value) => onChangeValue('diagnosticType', value)}
+              renderInput={(params) => <TextField {...params} label="Type de diagnostic" />}
+            />
+          )}
           <Autocomplete
             multiple
             options={criteriaData.data.encounterStatus || []}
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/index.tsx
index fadc12a81..3961f5e5b 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 import { Tab, Tabs } from '@mui/material'
 
 import Cim10Form from './components/Form/Cim10Form'
@@ -12,6 +12,7 @@ import { EXPLORATION } from '../../../../../../../../constants'
 import { CriteriaDrawerComponentProps } from 'types'
 import { Cim10DataType, Comparators, CriteriaType } from 'types/requestCriterias'
 import { Hierarchy } from 'types/hierarchy'
+import { AppConfig } from 'config'
 
 export const defaultCondition: Omit<Cim10DataType, 'id'> = {
   type: CriteriaType.CONDITION,
@@ -31,7 +32,10 @@ export const defaultCondition: Omit<Cim10DataType, 'id'> = {
 
 const Index = (props: CriteriaDrawerComponentProps) => {
   const { criteriaData, selectedCriteria, onChangeSelectedCriteria, goBack } = props
-  const [selectedTab, setSelectedTab] = useState<'form' | 'hierarchy'>(selectedCriteria ? 'form' : 'hierarchy')
+  const appConfig = useContext(AppConfig)
+  const [selectedTab, setSelectedTab] = useState<'form' | 'hierarchy'>(
+    selectedCriteria || !appConfig.core.fhir.valueSetExploration ? 'form' : 'hierarchy'
+  )
   const [defaultCriteria, setDefaultCriteria] = useState<Cim10DataType>(
     (selectedCriteria as Cim10DataType) || defaultCondition
   )
@@ -80,7 +84,7 @@ const Index = (props: CriteriaDrawerComponentProps) => {
         value={selectedTab}
         onChange={(e, tab) => setSelectedTab(tab)}
       >
-        <Tab label={EXPLORATION} value="hierarchy" />
+        {appConfig.core.fhir.valueSetExploration && <Tab label={EXPLORATION} value="hierarchy" />}
         <Tab label="Formulaire" value="form" />
       </Tabs>
 
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DemographicForm/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DemographicForm/index.tsx
index 2b42ac562..8facc3224 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DemographicForm/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DemographicForm/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useContext, useState } from 'react'
 
 import {
   Alert,
@@ -26,6 +26,7 @@ import { CriteriaDataKey, DemographicDataType, CriteriaType } from 'types/reques
 import { BlockWrapper } from 'components/ui/Layout'
 import { CriteriaDrawerComponentProps, CriteriaItemDataCache } from 'types'
 import { CriteriaLabel } from 'components/ui/CriteriaLabel'
+import { AppConfig } from 'config'
 
 enum Error {
   INCOHERENT_AGE_ERROR,
@@ -61,6 +62,7 @@ const DemographicForm = (props: CriteriaDrawerComponentProps) => {
   const [isInclusive, setIsInclusive] = useState<boolean>(
     selectedCriteria?.isInclusive === undefined ? true : selectedCriteria?.isInclusive
   )
+  const appConfig = useContext(AppConfig)
 
   const selectedPopulation = useAppSelector((state) => state.cohortCreation.request.selectedPopulation || [])
 
@@ -183,24 +185,26 @@ const DemographicForm = (props: CriteriaDrawerComponentProps) => {
             </BlockWrapper>
           )}
 
-          <BlockWrapper margin="1em">
-            <CriteriaLabel
-              label={
-                vitalStatus &&
-                vitalStatus.length === 1 &&
-                vitalStatus.find((status: LabelObject) => status.label === VitalStatusLabel.DECEASED)
-                  ? VitalStatusOptionsLabel.deceasedAge
-                  : VitalStatusOptionsLabel.age
-              }
-            />
-            <DurationRange
-              value={age}
-              active={!birthdates[0] || !birthdates[1]}
-              onChange={(value) => setAge(value)}
-              onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
-              deidentified={deidentified}
-            />
-          </BlockWrapper>
+          {appConfig.core.fhir.extraSearchParams && (
+            <BlockWrapper margin="1em">
+              <CriteriaLabel
+                label={
+                  vitalStatus &&
+                  vitalStatus.length === 1 &&
+                  vitalStatus.find((status: LabelObject) => status.label === VitalStatusLabel.DECEASED)
+                    ? VitalStatusOptionsLabel.deceasedAge
+                    : VitalStatusOptionsLabel.age
+                }
+              />
+              <DurationRange
+                value={age}
+                active={!birthdates[0] || !birthdates[1]}
+                onChange={(value) => setAge(value)}
+                onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
+                deidentified={deidentified}
+              />
+            </BlockWrapper>
+          )}
           {!deidentified &&
             vitalStatus &&
             (vitalStatus.length === 0 ||
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DocumentsForm/DocumentsForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DocumentsForm/DocumentsForm.tsx
index c43918b47..c3edbbc30 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DocumentsForm/DocumentsForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DocumentsForm/DocumentsForm.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 import _ from 'lodash'
 
 import {
@@ -38,6 +38,7 @@ import SearchInput from 'components/ui/Searchbar/SearchInput'
 import { BlockWrapper } from 'components/ui/Layout'
 import OccurenceInput from 'components/ui/Inputs/Occurences'
 import { SourceType } from 'types/scope'
+import { AppConfig } from 'config'
 
 const defaultComposition: Omit<DocumentDataType, 'id'> = {
   type: CriteriaType.DOCUMENTS,
@@ -64,7 +65,7 @@ enum Error {
 
 const DocumentsForm: React.FC<CriteriaDrawerComponentProps> = (props) => {
   const { criteriaData, selectedCriteria, onChangeSelectedCriteria, goBack } = props
-
+  const appConfig = useContext(AppConfig)
   const { classes } = useStyles()
   const [defaultValues, setDefaultValues] = useState<DocumentDataType>(
     (selectedCriteria as DocumentDataType) || defaultComposition
@@ -272,16 +273,18 @@ const DocumentsForm: React.FC<CriteriaDrawerComponentProps> = (props) => {
             }}
           />
 
-          <FormControl variant="outlined" className={classes.inputItem}>
-            <Autocomplete
-              disableCloseOnSelect
-              multiple
-              onChange={(e, value) => _onChangeValue('docStatuses', value)}
-              options={docStatuses}
-              value={defaultValues.docStatuses || undefined}
-              renderInput={(params) => <TextField {...params} placeholder="Statut de documents" />}
-            />
-          </FormControl>
+          {appConfig.core.fhir.extraSearchParams && (
+            <FormControl variant="outlined" className={classes.inputItem}>
+              <Autocomplete
+                disableCloseOnSelect
+                multiple
+                onChange={(e, value) => _onChangeValue('docStatuses', value)}
+                options={docStatuses}
+                value={defaultValues.docStatuses || undefined}
+                renderInput={(params) => <TextField {...params} placeholder="Statut de documents" />}
+              />
+            </FormControl>
+          )}
 
           <FormControl variant="outlined" className={classes.inputItem}>
             <Autocomplete
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/EncounterForm/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/EncounterForm/index.tsx
index ba197c122..803c42256 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/EncounterForm/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/EncounterForm/index.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect, useState } from 'react'
+/* eslint-disable max-statements */
+import React, { useContext, useEffect, useState } from 'react'
 
 import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace'
 import {
@@ -32,6 +33,7 @@ import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
 import { CriteriaLabel } from 'components/ui/CriteriaLabel'
 import ExecutiveUnitsInput from 'components/ui/Inputs/ExecutiveUnit'
+import { AppConfig } from 'config'
 
 enum Error {
   EMPTY_FORM,
@@ -51,6 +53,7 @@ const EncounterForm = ({
   goBack,
   onChangeSelectedCriteria
 }: CriteriaDrawerComponentProps) => {
+  const appConfig = useContext(AppConfig)
   const criteria = selectedCriteria as EncounterDataType
   const [title, setTitle] = useState(criteria?.title || 'Critère de prise en charge')
   const [age, setAge] = useState<DurationRangeType>(criteria?.age || [null, null])
@@ -247,42 +250,46 @@ const EncounterForm = ({
             />
           </BlockWrapper>
 
-          <BlockWrapper container className={classes.inputItem}>
-            <CriteriaLabel label="Durée de la prise en charge" infoIcon="Ne concerne pas les consultations" />
-            <DurationRange
-              value={duration}
-              unit={'Durée'}
-              onChange={(value) => setDuration(value)}
-              onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
-            />
-          </BlockWrapper>
+          {appConfig.core.fhir.extraSearchParams && (
+            <>
+              <BlockWrapper container className={classes.inputItem}>
+                <CriteriaLabel label="Durée de la prise en charge" infoIcon="Ne concerne pas les consultations" />
+                <DurationRange
+                  value={duration}
+                  unit={'Durée'}
+                  onChange={(value) => setDuration(value)}
+                  onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
+                />
+              </BlockWrapper>
 
-          <BlockWrapper className={classes.inputItem}>
-            <CriteriaLabel label="Date de prise en charge" infoIcon="Ne concerne pas les consultations" />
+              <BlockWrapper className={classes.inputItem}>
+                <CriteriaLabel label="Date de prise en charge" infoIcon="Ne concerne pas les consultations" />
 
-            <FormLabel style={{ padding: '0 0 0.5em', fontWeight: 600, fontSize: 12 }} component="legend">
-              Début de prise en charge
-            </FormLabel>
-            <CalendarRange
-              inline
-              value={encounterStartDate}
-              onChange={(newStartDate) => setEncounterStartDate(newStartDate)}
-              onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
-              includeNullValues={includeEncounterStartDateNull}
-              onChangeIncludeNullValues={(includeNullValues) => setIncludeEncounterStartDateNull(includeNullValues)}
-            />
-            <FormLabel style={{ padding: '1em 0 0.5em', fontWeight: 600, fontSize: 12 }} component="legend">
-              Fin de prise en charge
-            </FormLabel>
-            <CalendarRange
-              inline
-              value={encounterEndDate}
-              onChange={(newEndDate) => setEncounterEndDate(newEndDate)}
-              onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
-              includeNullValues={includeEncounterEndDateNull}
-              onChangeIncludeNullValues={(includeNullValues) => setIncludeEncounterEndDateNull(includeNullValues)}
-            />
-          </BlockWrapper>
+                <FormLabel style={{ padding: '0 0 0.5em', fontWeight: 600, fontSize: 12 }} component="legend">
+                  Début de prise en charge
+                </FormLabel>
+                <CalendarRange
+                  inline
+                  value={encounterStartDate}
+                  onChange={(newStartDate) => setEncounterStartDate(newStartDate)}
+                  onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
+                  includeNullValues={includeEncounterStartDateNull}
+                  onChangeIncludeNullValues={(includeNullValues) => setIncludeEncounterStartDateNull(includeNullValues)}
+                />
+                <FormLabel style={{ padding: '1em 0 0.5em', fontWeight: 600, fontSize: 12 }} component="legend">
+                  Fin de prise en charge
+                </FormLabel>
+                <CalendarRange
+                  inline
+                  value={encounterEndDate}
+                  onChange={(newEndDate) => setEncounterEndDate(newEndDate)}
+                  onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
+                  includeNullValues={includeEncounterEndDateNull}
+                  onChangeIncludeNullValues={(includeNullValues) => setIncludeEncounterEndDateNull(includeNullValues)}
+                />
+              </BlockWrapper>
+            </>
+          )}
 
           <BlockWrapper className={classes.inputItem}>
             <Collapse title="Général" value={false}>
@@ -298,18 +305,20 @@ const EncounterForm = ({
                   renderInput={(params) => <TextField {...params} label="Type de prise en charge" />}
                 />
               </BlockWrapper>
-              <BlockWrapper className={classes.inputItem}>
-                <Autocomplete
-                  multiple
-                  id="criteria-TypeDeSejour-autocomplete"
-                  options={criteriaData.data.typeDeSejour || []}
-                  getOptionLabel={(option) => option.label}
-                  isOptionEqualToValue={(option, value) => option.id === value.id}
-                  value={typeDeSejour}
-                  onChange={(e, value) => setTypeDeSejour(value)}
-                  renderInput={(params) => <TextField {...params} label="Type séjour" />}
-                />
-              </BlockWrapper>
+              {appConfig.core.fhir.extraSearchParams && (
+                <BlockWrapper className={classes.inputItem}>
+                  <Autocomplete
+                    multiple
+                    id="criteria-TypeDeSejour-autocomplete"
+                    options={criteriaData.data.typeDeSejour || []}
+                    getOptionLabel={(option) => option.label}
+                    isOptionEqualToValue={(option, value) => option.id === value.id}
+                    value={typeDeSejour}
+                    onChange={(e, value) => setTypeDeSejour(value)}
+                    renderInput={(params) => <TextField {...params} label="Type séjour" />}
+                  />
+                </BlockWrapper>
+              )}
               <BlockWrapper className={classes.inputItem}>
                 <Autocomplete
                   multiple
@@ -335,80 +344,85 @@ const EncounterForm = ({
                 onChange={(e, value) => setAdmissionMode(value)}
                 renderInput={(params) => <TextField {...params} label="Motif Admission" />}
               />
-
-              <Autocomplete
-                multiple
-                id="criteria-admission-autocomplete"
-                options={criteriaData.data.admission || []}
-                getOptionLabel={(option) => option.label}
-                isOptionEqualToValue={(option, value) => option.id === value.id}
-                value={admission}
-                onChange={(e, value) => setAdmission(value)}
-                renderInput={(params) => <TextField {...params} label="Type Admission" />}
-              />
+              {appConfig.core.fhir.extraSearchParams && (
+                <Autocomplete
+                  multiple
+                  id="criteria-admission-autocomplete"
+                  options={criteriaData.data.admission || []}
+                  getOptionLabel={(option) => option.label}
+                  isOptionEqualToValue={(option, value) => option.id === value.id}
+                  value={admission}
+                  onChange={(e, value) => setAdmission(value)}
+                  renderInput={(params) => <TextField {...params} label="Type Admission" />}
+                />
+              )}
             </Collapse>
           </BlockWrapper>
-          <BlockWrapper className={classes.inputItem}>
-            <Collapse title="Entrée / Sortie" value={false}>
-              <Autocomplete
-                multiple
-                id="criteria-entryMode-autocomplete"
-                options={criteriaData.data.entryModes || []}
-                getOptionLabel={(option) => option.label}
-                isOptionEqualToValue={(option, value) => option.id === value.id}
-                value={entryMode}
-                onChange={(e, value) => setEntryMode(value)}
-                renderInput={(params) => <TextField {...params} label="Mode entrée" />}
-              />
+          {appConfig.core.fhir.extraSearchParams && (
+            <BlockWrapper className={classes.inputItem}>
+              <Collapse title="Entrée / Sortie" value={false}>
+                <Autocomplete
+                  multiple
+                  id="criteria-entryMode-autocomplete"
+                  options={criteriaData.data.entryModes || []}
+                  getOptionLabel={(option) => option.label}
+                  isOptionEqualToValue={(option, value) => option.id === value.id}
+                  value={entryMode}
+                  onChange={(e, value) => setEntryMode(value)}
+                  renderInput={(params) => <TextField {...params} label="Mode entrée" />}
+                />
 
-              <Autocomplete
-                multiple
-                id="criteria-exitMode-autocomplete"
-                options={criteriaData.data.exitModes || []}
-                getOptionLabel={(option) => option.label}
-                isOptionEqualToValue={(option, value) => option.id === value.id}
-                value={exitMode}
-                onChange={(e, value) => setExitMode(value)}
-                renderInput={(params) => <TextField {...params} label="Mode sortie" />}
-              />
+                <Autocomplete
+                  multiple
+                  id="criteria-exitMode-autocomplete"
+                  options={criteriaData.data.exitModes || []}
+                  getOptionLabel={(option) => option.label}
+                  isOptionEqualToValue={(option, value) => option.id === value.id}
+                  value={exitMode}
+                  onChange={(e, value) => setExitMode(value)}
+                  renderInput={(params) => <TextField {...params} label="Mode sortie" />}
+                />
 
-              <Autocomplete
-                multiple
-                id="criteria-reason-autocomplete"
-                options={criteriaData.data.reason || []}
-                getOptionLabel={(option) => option.label}
-                isOptionEqualToValue={(option, value) => option.id === value.id}
-                value={reason}
-                onChange={(e, value) => setReason(value)}
-                renderInput={(params) => <TextField {...params} label="Type sortie" />}
-              />
-            </Collapse>
-          </BlockWrapper>
-          <BlockWrapper className={classes.inputItem}>
-            <Collapse title="Destination / Provenance" value={false}>
-              <Autocomplete
-                multiple
-                id="criteria-destination-autocomplete"
-                options={criteriaData.data.destination || []}
-                getOptionLabel={(option) => option.label}
-                isOptionEqualToValue={(option, value) => option.id === value.id}
-                value={destination}
-                onChange={(e, value) => setDestination(value)}
-                renderInput={(params) => <TextField {...params} label="Destination" />}
-              />
+                <Autocomplete
+                  multiple
+                  id="criteria-reason-autocomplete"
+                  options={criteriaData.data.reason || []}
+                  getOptionLabel={(option) => option.label}
+                  isOptionEqualToValue={(option, value) => option.id === value.id}
+                  value={reason}
+                  onChange={(e, value) => setReason(value)}
+                  renderInput={(params) => <TextField {...params} label="Type sortie" />}
+                />
+              </Collapse>
+            </BlockWrapper>
+          )}
+          {appConfig.core.fhir.extraSearchParams && (
+            <BlockWrapper className={classes.inputItem}>
+              <Collapse title="Destination / Provenance" value={false}>
+                <Autocomplete
+                  multiple
+                  id="criteria-destination-autocomplete"
+                  options={criteriaData.data.destination || []}
+                  getOptionLabel={(option) => option.label}
+                  isOptionEqualToValue={(option, value) => option.id === value.id}
+                  value={destination}
+                  onChange={(e, value) => setDestination(value)}
+                  renderInput={(params) => <TextField {...params} label="Destination" />}
+                />
 
-              <Autocomplete
-                multiple
-                id="criteria-provenance-autocomplete"
-                options={criteriaData.data.provenance || []}
-                getOptionLabel={(option) => option.label}
-                isOptionEqualToValue={(option, value) => option.id === value.id}
-                value={provenance}
-                onChange={(e, value) => setProvenance(value)}
-                renderInput={(params) => <TextField {...params} label="Provenance" />}
-              />
-            </Collapse>
-          </BlockWrapper>
+                <Autocomplete
+                  multiple
+                  id="criteria-provenance-autocomplete"
+                  options={criteriaData.data.provenance || []}
+                  getOptionLabel={(option) => option.label}
+                  isOptionEqualToValue={(option, value) => option.id === value.id}
+                  value={provenance}
+                  onChange={(e, value) => setProvenance(value)}
+                  renderInput={(params) => <TextField {...params} label="Provenance" />}
+                />
+              </Collapse>
+            </BlockWrapper>
+          )}
           <Grid className={classes.criteriaActionContainer}>
             {!isEdition && (
               <Button onClick={goBack} variant="outlined">
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/index.tsx
index 88af99817..5236c7556 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHM/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 import { Tab, Tabs } from '@mui/material'
 
 import GHMForm from './components/Form/GhmForm'
@@ -12,6 +12,7 @@ import { EXPLORATION } from '../../../../../../../../constants'
 import { CriteriaDrawerComponentProps } from 'types'
 import { Comparators, GhmDataType, CriteriaType } from 'types/requestCriterias'
 import { Hierarchy } from 'types/hierarchy'
+import { AppConfig } from 'config'
 
 export const defaultClaim: Omit<GhmDataType, 'id'> = {
   type: CriteriaType.CLAIM,
@@ -29,7 +30,10 @@ export const defaultClaim: Omit<GhmDataType, 'id'> = {
 
 const Index = (props: CriteriaDrawerComponentProps) => {
   const { criteriaData, selectedCriteria, onChangeSelectedCriteria, goBack } = props
-  const [selectedTab, setSelectedTab] = useState<'form' | 'hierarchy'>(selectedCriteria ? 'form' : 'hierarchy')
+  const appConfig = useContext(AppConfig)
+  const [selectedTab, setSelectedTab] = useState<'form' | 'hierarchy'>(
+    selectedCriteria || !appConfig.core.fhir.valueSetExploration ? 'form' : 'hierarchy'
+  )
   const [defaultCriteria, setDefaultCriteria] = useState<GhmDataType>((selectedCriteria as GhmDataType) || defaultClaim)
 
   const isEdition = selectedCriteria !== null
@@ -71,7 +75,7 @@ const Index = (props: CriteriaDrawerComponentProps) => {
         value={selectedTab}
         onChange={(e, tab) => setSelectedTab(tab)}
       >
-        <Tab label={EXPLORATION} value="hierarchy" />
+        {appConfig.core.fhir.valueSetExploration && <Tab label={EXPLORATION} value="hierarchy" />}
         <Tab label="Formulaire" value="form" />
       </Tabs>
 
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/ImagingForm/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/ImagingForm/index.tsx
index 25e0e1a91..571c393a5 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/ImagingForm/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/ImagingForm/index.tsx
@@ -253,14 +253,16 @@ const ImagingForm: React.FC<CriteriaDrawerComponentProps> = (props) => {
             style={{ marginBottom: '1em' }}
           />
 
-          <BlockWrapper style={{ marginBottom: '1em' }}>
-            <SearchbarWithCheck
-              searchInput={studyDescription}
-              setSearchInput={setStudyDescription}
-              placeholder="Rechercher dans les descriptions"
-              onError={(isError) => setError(isError ? Error.SEARCHINPUT_ERROR : Error.NO_ERROR)}
-            />
-          </BlockWrapper>
+          {appConfig.core.fhir.extraSearchParams && (
+            <BlockWrapper style={{ marginBottom: '1em' }}>
+              <SearchbarWithCheck
+                searchInput={studyDescription}
+                setSearchInput={setStudyDescription}
+                placeholder="Rechercher dans les descriptions"
+                onError={(isError) => setError(isError ? Error.SEARCHINPUT_ERROR : Error.NO_ERROR)}
+              />
+            </BlockWrapper>
+          )}
 
           <BlockWrapper style={{ marginBottom: '1em' }}>
             <SearchbarWithCheck
@@ -271,75 +273,79 @@ const ImagingForm: React.FC<CriteriaDrawerComponentProps> = (props) => {
             />
           </BlockWrapper>
 
-          <BlockWrapper style={{ marginBottom: '1em' }}>
-            <OccurenceInput
-              label="Nombre de séries"
-              value={numberOfSeries}
-              comparator={seriesComparator}
-              onchange={(newOccurence, newComparator) => {
-                setNumberOfSeries(newOccurence)
-                setSeriesComparator(newComparator)
-              }}
-            />
-          </BlockWrapper>
-
-          <BlockWrapper style={{ marginBottom: '1em' }}>
-            <OccurenceInput
-              label="Nombre d'instances"
-              value={numberOfIns}
-              comparator={instancesComparator}
-              onchange={(newOccurence, newComparator) => {
-                setNumberOfIns(newOccurence)
-                setInstancesComparator(newComparator)
-              }}
-            />
-          </BlockWrapper>
-
-          <BlockWrapper style={{ marginBottom: '1em' }}>
-            <CriteriaLabel label="Méthode de rattachement à un document" />
-            <Grid container alignItems="center">
-              <Grid item xs={withDocument === DocumentAttachmentMethod.INFERENCE_TEMPOREL ? 6 : 12}>
-                <Select
-                  value={withDocument}
-                  onChange={(event) => setWithDocument(event.target.value as DocumentAttachmentMethod)}
-                  style={{ width: '100%' }}
-                >
-                  {withDocumentOptions.map((option) => (
-                    <MenuItem key={option.id} value={option.id}>
-                      {option.label}
-                    </MenuItem>
-                  ))}
-                </Select>
-              </Grid>
-              {withDocument === DocumentAttachmentMethod.INFERENCE_TEMPOREL && (
-                <Grid item xs={6} padding={'0 12px'}>
-                  <Grid container>
-                    <Grid item xs={4}>
-                      <DurationUnitWrapper>Plage de </DurationUnitWrapper>
-                    </Grid>
-                    <Grid item xs={4}>
-                      <TextFieldWrapper
-                        activated={!!daysOfDelay}
-                        value={daysOfDelay}
-                        variant="standard"
-                        size="small"
-                        onChange={(event) => setDaysOfDelay(event.target.value)}
-                        type="number"
-                        InputProps={{
-                          inputProps: {
-                            min: 0
-                          }
-                        }}
-                      />
-                    </Grid>
-                    <Grid item xs={4}>
-                      <DurationUnitWrapper>{CalendarRequestLabel.DAY}</DurationUnitWrapper>
+          {appConfig.core.fhir.extraSearchParams && (
+            <BlockWrapper style={{ marginBottom: '1em' }}>
+              <OccurenceInput
+                label="Nombre de séries"
+                value={numberOfSeries}
+                comparator={seriesComparator}
+                onchange={(newOccurence, newComparator) => {
+                  setNumberOfSeries(newOccurence)
+                  setSeriesComparator(newComparator)
+                }}
+              />
+            </BlockWrapper>
+          )}
+          {appConfig.core.fhir.extraSearchParams && (
+            <BlockWrapper style={{ marginBottom: '1em' }}>
+              <OccurenceInput
+                label="Nombre d'instances"
+                value={numberOfIns}
+                comparator={instancesComparator}
+                onchange={(newOccurence, newComparator) => {
+                  setNumberOfIns(newOccurence)
+                  setInstancesComparator(newComparator)
+                }}
+              />
+            </BlockWrapper>
+          )}
+          {appConfig.core.fhir.extraSearchParams && (
+            <BlockWrapper style={{ marginBottom: '1em' }}>
+              <CriteriaLabel label="Méthode de rattachement à un document" />
+              <Grid container alignItems="center">
+                <Grid item xs={withDocument === DocumentAttachmentMethod.INFERENCE_TEMPOREL ? 6 : 12}>
+                  <Select
+                    value={withDocument}
+                    onChange={(event) => setWithDocument(event.target.value as DocumentAttachmentMethod)}
+                    style={{ width: '100%' }}
+                  >
+                    {withDocumentOptions.map((option) => (
+                      <MenuItem key={option.id} value={option.id}>
+                        {option.label}
+                      </MenuItem>
+                    ))}
+                  </Select>
+                </Grid>
+                {withDocument === DocumentAttachmentMethod.INFERENCE_TEMPOREL && (
+                  <Grid item xs={6} padding={'0 12px'}>
+                    <Grid container>
+                      <Grid item xs={4}>
+                        <DurationUnitWrapper>Plage de </DurationUnitWrapper>
+                      </Grid>
+                      <Grid item xs={4}>
+                        <TextFieldWrapper
+                          activated={!!daysOfDelay}
+                          value={daysOfDelay}
+                          variant="standard"
+                          size="small"
+                          onChange={(event) => setDaysOfDelay(event.target.value)}
+                          type="number"
+                          InputProps={{
+                            inputProps: {
+                              min: 0
+                            }
+                          }}
+                        />
+                      </Grid>
+                      <Grid item xs={4}>
+                        <DurationUnitWrapper>{CalendarRequestLabel.DAY}</DurationUnitWrapper>
+                      </Grid>
                     </Grid>
                   </Grid>
-                </Grid>
-              )}
-            </Grid>
-          </BlockWrapper>
+                )}
+              </Grid>
+            </BlockWrapper>
+          )}
 
           <CriteriaLabel label="Recherche par uid d'étude" />
           <UidTextfield
@@ -350,63 +356,65 @@ const ImagingForm: React.FC<CriteriaDrawerComponentProps> = (props) => {
         </Collapse>
 
         {/*critères de série : */}
-        <BlockWrapper style={{ marginTop: 26 }}>
-          <Collapse
-            title="Critères liés à une série"
-            value={isSeriesUsed}
-            margin="0"
-            info="Une série est une des acquisitions lors d'un examen."
-          >
-            <BlockWrapper style={{ margin: '0 2em 1em 0' }}>
-              <CriteriaLabel label="Date de la série" style={{ padding: 0 }} />
-              <CalendarRange
-                inline
-                value={[seriesStartDate, seriesEndDate]}
-                onChange={([start, end]) => {
-                  setSeriesStartDate(start || null)
-                  setSeriesEndDate(end || null)
-                }}
-                onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
-              />
-            </BlockWrapper>
+        {appConfig.core.fhir.extraSearchParams && (
+          <BlockWrapper style={{ marginTop: 26 }}>
+            <Collapse
+              title="Critères liés à une série"
+              value={isSeriesUsed}
+              margin="0"
+              info="Une série est une des acquisitions lors d'un examen."
+            >
+              <BlockWrapper style={{ margin: '0 2em 1em 0' }}>
+                <CriteriaLabel label="Date de la série" style={{ padding: 0 }} />
+                <CalendarRange
+                  inline
+                  value={[seriesStartDate, seriesEndDate]}
+                  onChange={([start, end]) => {
+                    setSeriesStartDate(start || null)
+                    setSeriesEndDate(end || null)
+                  }}
+                  onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
+                />
+              </BlockWrapper>
 
-            <BlockWrapper style={{ marginBottom: '1em' }}>
-              <SearchbarWithCheck
-                searchInput={seriesDescription}
-                setSearchInput={setSeriesDescription}
-                placeholder="Rechercher dans les descriptions"
-                onError={(isError) => setError(isError ? Error.SEARCHINPUT_ERROR : Error.NO_ERROR)}
-              />
-            </BlockWrapper>
+              <BlockWrapper style={{ marginBottom: '1em' }}>
+                <SearchbarWithCheck
+                  searchInput={seriesDescription}
+                  setSearchInput={setSeriesDescription}
+                  placeholder="Rechercher dans les descriptions"
+                  onError={(isError) => setError(isError ? Error.SEARCHINPUT_ERROR : Error.NO_ERROR)}
+                />
+              </BlockWrapper>
 
-            <BlockWrapper style={{ marginBottom: '1em' }}>
-              <SearchbarWithCheck
-                searchInput={seriesProtocol}
-                setSearchInput={setSeriesProtocol}
-                placeholder="Rechercher dans les protocoles"
-                onError={(isError) => setError(isError ? Error.SEARCHINPUT_ERROR : Error.NO_ERROR)}
-              />
-            </BlockWrapper>
+              <BlockWrapper style={{ marginBottom: '1em' }}>
+                <SearchbarWithCheck
+                  searchInput={seriesProtocol}
+                  setSearchInput={setSeriesProtocol}
+                  placeholder="Rechercher dans les protocoles"
+                  onError={(isError) => setError(isError ? Error.SEARCHINPUT_ERROR : Error.NO_ERROR)}
+                />
+              </BlockWrapper>
 
-            <Autocomplete
-              multiple
-              options={criteriaData?.data.modalities || []}
-              getOptionLabel={(option) => option.label}
-              isOptionEqualToValue={(option, value) => option.id === value.id}
-              value={seriesModalities}
-              onChange={(e, value) => setSeriesModalities(value)}
-              renderInput={(params) => <TextField {...params} label="Modalités" />}
-              style={{ marginBottom: '1em' }}
-            />
+              <Autocomplete
+                multiple
+                options={criteriaData?.data.modalities || []}
+                getOptionLabel={(option) => option.label}
+                isOptionEqualToValue={(option, value) => option.id === value.id}
+                value={seriesModalities}
+                onChange={(e, value) => setSeriesModalities(value)}
+                renderInput={(params) => <TextField {...params} label="Modalités" />}
+                style={{ marginBottom: '1em' }}
+              />
 
-            <CriteriaLabel label="Recherche par uid de série" />
-            <UidTextfield
-              value={seriesUid}
-              onChange={setSeriesUid}
-              onError={(isError) => setError(isError ? Error.UID_ERROR : Error.NO_ERROR)}
-            />
-          </Collapse>
-        </BlockWrapper>
+              <CriteriaLabel label="Recherche par uid de série" />
+              <UidTextfield
+                value={seriesUid}
+                onChange={setSeriesUid}
+                onError={(isError) => setError(isError ? Error.UID_ERROR : Error.NO_ERROR)}
+              />
+            </Collapse>
+          </BlockWrapper>
+        )}
       </BlockWrapper>
 
       <AdvancedInputs
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx
index b853be09b..563719ce9 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 
 import {
   Alert,
@@ -32,6 +32,7 @@ import { BlockWrapper } from 'components/ui/Layout'
 import OccurenceInput from 'components/ui/Inputs/Occurences'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
+import { AppConfig } from 'config'
 
 type MedicationFormProps = {
   isOpen: boolean
@@ -54,7 +55,7 @@ const MedicationForm: React.FC<MedicationFormProps> = (props) => {
 
   const { classes } = useStyles()
   const dispatch = useAppDispatch()
-
+  const appConfig = useContext(AppConfig)
   const initialState: HierarchyTree | null = useAppSelector((state) => state.syncHierarchyTable)
   const currentState = { ...selectedCriteria, ...initialState }
   const [multiFields, setMultiFields] = useState<string | null>(localStorage.getItem('multiple_fields'))
@@ -231,17 +232,19 @@ const MedicationForm: React.FC<MedicationFormProps> = (props) => {
               renderInput={(params) => <TextField {...params} label="Type de prescription" />}
             />
           )}
-          <Autocomplete
-            multiple
-            id="criteria-prescription-type-autocomplete"
-            className={classes.inputItem}
-            options={criteriaData.data.administrations || []}
-            getOptionLabel={(option) => option.label}
-            isOptionEqualToValue={(option, value) => option.id === value.id}
-            value={selectedCriteriaAdministration}
-            onChange={(e, value) => onChangeValue('administration', value)}
-            renderInput={(params) => <TextField {...params} label="Voie d'administration" />}
-          />
+          {appConfig.core.fhir.extraSearchParams && (
+            <Autocomplete
+              multiple
+              id="criteria-prescription-type-autocomplete"
+              className={classes.inputItem}
+              options={criteriaData.data.administrations || []}
+              getOptionLabel={(option) => option.label}
+              isOptionEqualToValue={(option, value) => option.id === value.id}
+              value={selectedCriteriaAdministration}
+              onChange={(e, value) => onChangeValue('administration', value)}
+              renderInput={(params) => <TextField {...params} label="Voie d'administration" />}
+            />
+          )}
           <Autocomplete
             multiple
             options={criteriaData.data.encounterStatus || []}
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx
index dee1c6f4e..d9d51f9ba 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useContext } from 'react'
 import { Tabs, Tab } from '@mui/material'
 
 import MedicationForm from './components/Form/MedicationForm'
@@ -13,6 +13,7 @@ import { fetchMedication } from 'state/medication'
 import { EXPLORATION } from '../../../../../../../../constants'
 import { Comparators, MedicationDataType, CriteriaType } from 'types/requestCriterias'
 import { Hierarchy } from 'types/hierarchy'
+import { AppConfig } from 'config'
 
 export const defaultMedication: Omit<MedicationDataType, 'id'> = {
   type: CriteriaType.MEDICATION_REQUEST,
@@ -31,7 +32,10 @@ export const defaultMedication: Omit<MedicationDataType, 'id'> = {
 
 const Index = (props: CriteriaDrawerComponentProps) => {
   const { criteriaData, selectedCriteria, onChangeSelectedCriteria, goBack } = props
-  const [selectedTab, setSelectedTab] = useState<'form' | 'exploration'>(selectedCriteria ? 'form' : 'exploration')
+  const appConfig = useContext(AppConfig)
+  const [selectedTab, setSelectedTab] = useState<'form' | 'exploration'>(
+    selectedCriteria || !appConfig.core.fhir.valueSetExploration ? 'form' : 'exploration'
+  )
   const [defaultCriteria, setDefaultCriteria] = useState<MedicationDataType>(
     (selectedCriteria as MedicationDataType) || defaultMedication
   )
@@ -74,7 +78,7 @@ const Index = (props: CriteriaDrawerComponentProps) => {
         value={selectedTab}
         onChange={(e, tab) => setSelectedTab(tab)}
       >
-        <Tab label={EXPLORATION} value="exploration" />
+        {appConfig.core.fhir.valueSetExploration && <Tab label={EXPLORATION} value="exploration" />}
         <Tab label="Formulaire" value="form" />
       </Tabs>
 
diff --git a/src/components/Dashboard/PMSIList/index.tsx b/src/components/Dashboard/PMSIList/index.tsx
index 77777b9e6..1533bf222 100644
--- a/src/components/Dashboard/PMSIList/index.tsx
+++ b/src/components/Dashboard/PMSIList/index.tsx
@@ -302,7 +302,7 @@ const PMSIList = ({ deidentified }: PMSIListProps) => {
           <Grid container alignItems="center">
             <Grid item xs={12} md={12} lg={4} xl={4}>
               <Tabs
-                values={PMSITabs}
+                values={PMSITabs()}
                 active={selectedTab}
                 onchange={(value: PmsiTab) => {
                   setSelectedTab(value)
diff --git a/src/components/Dashboard/PatientList/PatientList.tsx b/src/components/Dashboard/PatientList/PatientList.tsx
index e75183ea6..9ad2e2e9d 100644
--- a/src/components/Dashboard/PatientList/PatientList.tsx
+++ b/src/components/Dashboard/PatientList/PatientList.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef, useMemo } from 'react'
+import React, { useState, useEffect, useRef, useMemo, useContext } from 'react'
 
 import { CircularProgress, Grid, Tooltip } from '@mui/material'
 
@@ -50,6 +50,7 @@ import List from 'components/ui/List'
 import { useAppDispatch, useAppSelector } from 'state'
 import { useSearchParams } from 'react-router-dom'
 import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
+import { AppConfig } from 'config'
 
 type PatientListProps = {
   total: number
@@ -57,6 +58,7 @@ type PatientListProps = {
 }
 
 const PatientList = ({ total, deidentified }: PatientListProps) => {
+  const appConfig = useContext(AppConfig)
   const dispatch = useAppDispatch()
   const [searchParams, setSearchParams] = useSearchParams()
   const getPageParam = searchParams.get('page')
@@ -100,7 +102,7 @@ const PatientList = ({ total, deidentified }: PatientListProps) => {
       filters: { genders, birthdatesRanges, vitalStatuses }
     },
     { changeOrderBy, changeSearchBy, changeSearchInput, addFilters, removeFilter, addSearchCriterias }
-  ] = useSearchCriterias(initPatientsSearchCriterias)
+  ] = useSearchCriterias(initPatientsSearchCriterias())
 
   const filtersAsArray = useMemo(() => {
     return selectFiltersAsArray({ genders, vitalStatuses, birthdatesRanges })
@@ -180,15 +182,17 @@ const PatientList = ({ total, deidentified }: PatientListProps) => {
   return (
     <Grid container gap="25px">
       <Grid item xs={12}>
-        <PatientCharts
-          agePyramid={
-            loadingStatus === LoadingStatus.FETCHING || loadingStatus === LoadingStatus.IDDLE ? [] : agePyramid
-          }
-          patientData={
-            loadingStatus === LoadingStatus.FETCHING || loadingStatus === LoadingStatus.IDDLE ? {} : patientData
-          }
-          loading={loadingStatus === LoadingStatus.FETCHING || loadingStatus === LoadingStatus.IDDLE}
-        />
+        {appConfig.core.fhir.facetsExtensions && (
+          <PatientCharts
+            agePyramid={
+              loadingStatus === LoadingStatus.FETCHING || loadingStatus === LoadingStatus.IDDLE ? [] : agePyramid
+            }
+            patientData={
+              loadingStatus === LoadingStatus.FETCHING || loadingStatus === LoadingStatus.IDDLE ? {} : patientData
+            }
+            loading={loadingStatus === LoadingStatus.FETCHING || loadingStatus === LoadingStatus.IDDLE}
+          />
+        )}
       </Grid>
       <Grid container justifyContent="flex-end" gap="10px">
         <Grid container item xs={12} md={10} lg={7} xl={5} justifyContent="flex-end" spacing={1}>
@@ -247,7 +251,7 @@ const PatientList = ({ total, deidentified }: PatientListProps) => {
                   value={searchBy || SearchByTypes.TEXT}
                   label="Rechercher dans :"
                   width={'150px'}
-                  items={searchByListPatients}
+                  items={searchByListPatients()}
                   onchange={(newValue: SearchByTypes) => changeSearchBy(newValue)}
                 />
                 <SearchInput
@@ -299,11 +303,13 @@ const PatientList = ({ total, deidentified }: PatientListProps) => {
       >
         <GendersFilter name={FilterKeys.GENDERS} value={genders} />
         <VitalStatusesFilter name={FilterKeys.VITAL_STATUSES} value={vitalStatuses} />
-        <BirthdatesRangesFilter
-          name={FilterKeys.BIRTHDATES}
-          value={birthdatesRanges}
-          deidentified={deidentified ?? false}
-        />
+        {appConfig.core.fhir.extraSearchParams && (
+          <BirthdatesRangesFilter
+            name={FilterKeys.BIRTHDATES}
+            value={birthdatesRanges}
+            deidentified={deidentified ?? false}
+          />
+        )}
       </Modal>
       <Modal
         title="Filtres sauvegardés"
@@ -381,7 +387,7 @@ const PatientList = ({ total, deidentified }: PatientListProps) => {
                     width="60%"
                     disabled={isReadonlyFilterInfoModal}
                     value={selectedSavedFilter?.filterParams.searchBy}
-                    items={searchByListPatients}
+                    items={searchByListPatients()}
                     name="searchBy"
                   />
                 </Grid>
diff --git a/src/components/DataTable/DataTableMedication.tsx b/src/components/DataTable/DataTableMedication.tsx
index ce602999c..be33b4c95 100644
--- a/src/components/DataTable/DataTableMedication.tsx
+++ b/src/components/DataTable/DataTableMedication.tsx
@@ -46,7 +46,7 @@ const DataTableMedication: React.FC<DataTableMedicationProps> = ({
   groupId
 }) => {
   const { classes } = useStyles()
-
+  const appConfig = useContext(AppConfig)
   const columns = [
     ...(showIpp ? [{ label: `IPP${deidentified ? ' chiffré' : ''}`, align: 'left' }] : []),
     { label: `NDA${deidentified ? ' chiffré' : ''}`, align: showIpp ? 'center' : 'left', code: Order.ENCOUNTER },
@@ -54,8 +54,12 @@ const DataTableMedication: React.FC<DataTableMedicationProps> = ({
       label: selectedTab === ResourceType.MEDICATION_REQUEST ? 'Date de prescription' : "Date d'administration",
       code: Order.PERIOD_START
     },
-    { label: 'Code ATC', code: Order.MEDICATION_ATC },
-    { label: 'Code UCD', code: Order.MEDICATION_UCD },
+    ...(appConfig.features.medication.useMedicationAtcUcdCodes
+      ? [
+          { label: 'Code ATC', code: Order.MEDICATION_ATC },
+          { label: 'Code UCD', code: Order.MEDICATION_UCD }
+        ]
+      : [{ label: 'Code', code: 'code' }]),
     selectedTab === ResourceType.MEDICATION_REQUEST
       ? { label: 'Type de prescription', code: Order.PRESCRIPTION_TYPES }
       : null,
@@ -136,9 +140,7 @@ const DataTableMedicationLine: React.FC<{
   const ipp = medication.IPP
   const nda = medication.NDA
   const date =
-    medication.resourceType === 'MedicationRequest'
-      ? medication.dispenseRequest?.validityPeriod?.start
-      : medication.effectivePeriod?.start
+    medication.resourceType === ResourceType.MEDICATION_REQUEST ? medication.authoredOn : medication.effectiveDateTime
 
   const [codeATC, displayATC, isATCStandard, codeATCSystem] = getCodes(
     medication,
@@ -150,6 +152,7 @@ const DataTableMedicationLine: React.FC<{
     appConfig.features.medication.valueSets.medicationUcd.url,
     '.*-ucd'
   )
+  const defaultCode = medication.medicationCodeableConcept?.coding?.at(0)
 
   const prescriptionType =
     medication.resourceType === 'MedicationRequest' && medication.category?.[0].coding?.[0].display
@@ -180,26 +183,38 @@ const DataTableMedicationLine: React.FC<{
       )}
       <TableCellWrapper align="left">{nda ?? 'Inconnu'}</TableCellWrapper>
       <TableCellWrapper>{date ? new Date(date).toLocaleDateString('fr-FR') : 'Date inconnue'}</TableCellWrapper>
-      <TableCellWrapper>
-        <Tooltip title={codeATCSystem}>
-          <Typography style={{ fontStyle: isATCStandard ? 'normal' : 'italic' }}>
-            {codeATC === 'No matching concept' || codeATC === 'Non Renseigné' ? '' : codeATC ?? ''}
-          </Typography>
-        </Tooltip>
-        <Typography className={classes.libelle}>
-          {displayATC === 'No matching concept' ? '-' : displayATC ?? '-'}
-        </Typography>
-      </TableCellWrapper>
-      <TableCellWrapper>
-        <Tooltip title={codeUCDSystem}>
-          <Typography style={{ fontStyle: isUCDStandard ? 'normal' : 'italic' }}>
-            {codeUCD === 'No matching concept' || codeUCD === 'Non Renseigné' ? '' : codeUCD ?? ''}
-          </Typography>
-        </Tooltip>
-        <Typography className={classes.libelle}>
-          {displayUCD === 'No matching concept' ? '-' : displayUCD ?? '-'}
-        </Typography>
-      </TableCellWrapper>
+      {appConfig.features.medication.useMedicationAtcUcdCodes ? (
+        <>
+          <TableCellWrapper>
+            <Tooltip title={codeATCSystem}>
+              <Typography style={{ fontStyle: isATCStandard ? 'normal' : 'italic' }}>
+                {codeATC === 'No matching concept' || codeATC === 'Non Renseigné' ? '' : codeATC ?? ''}
+              </Typography>
+            </Tooltip>
+            <Typography className={classes.libelle}>
+              {displayATC === 'No matching concept' ? '-' : displayATC ?? '-'}
+            </Typography>
+          </TableCellWrapper>
+          <TableCellWrapper>
+            <Tooltip title={codeUCDSystem}>
+              <Typography style={{ fontStyle: isUCDStandard ? 'normal' : 'italic' }}>
+                {codeUCD === 'No matching concept' || codeUCD === 'Non Renseigné' ? '' : codeUCD ?? ''}
+              </Typography>
+            </Tooltip>
+            <Typography className={classes.libelle}>
+              {displayUCD === 'No matching concept' ? '-' : displayUCD ?? '-'}
+            </Typography>
+          </TableCellWrapper>
+        </>
+      ) : (
+        <TableCellWrapper>
+          <Tooltip title={'Code'}>
+            <Typography>{defaultCode?.code}</Typography>
+          </Tooltip>
+          <Typography className={classes.libelle}>{defaultCode?.display}</Typography>
+        </TableCellWrapper>
+      )}
+
       {medication.resourceType === 'MedicationRequest' && (
         <TableCellWrapper>{prescriptionType ?? '-'}</TableCellWrapper>
       )}
diff --git a/src/components/DataTable/DataTableObservation.tsx b/src/components/DataTable/DataTableObservation.tsx
index 4d4bf08d5..a7649d5ee 100644
--- a/src/components/DataTable/DataTableObservation.tsx
+++ b/src/components/DataTable/DataTableObservation.tsx
@@ -105,13 +105,19 @@ const DataTableObservationLine: React.FC<{
   const nda = observation.NDA
   const date = observation.effectiveDateTime
   const libelleANABIO = observation.code?.coding?.find(
-    (code) => code.system === appConfig.features.observation.valueSets.biologyHierarchyAnabio.url && code.userSelected
+    (code) =>
+      code.system === appConfig.features.observation.valueSets.biologyHierarchyAnabio.url &&
+      (!appConfig.core.fhir.selectedCodeOnly || code.userSelected)
   )?.display
   const codeLOINC = observation.code?.coding?.find(
-    (code) => code.system === appConfig.features.observation.valueSets.biologyHierarchyLoinc.url && code.userSelected
+    (code) =>
+      code.system === appConfig.features.observation.valueSets.biologyHierarchyLoinc.url &&
+      (!appConfig.core.fhir.selectedCodeOnly || code.userSelected)
   )?.code
   const libelleLOINC = observation.code?.coding?.find(
-    (code) => code.system === appConfig.features.observation.valueSets.biologyHierarchyLoinc.url && code.userSelected
+    (code) =>
+      code.system === appConfig.features.observation.valueSets.biologyHierarchyLoinc.url &&
+      (!appConfig.core.fhir.selectedCodeOnly || code.userSelected)
   )?.display
   const result =
     observation.valueQuantity && observation.valueQuantity?.value !== null
diff --git a/src/components/DataTable/DataTablePatient.tsx b/src/components/DataTable/DataTablePatient.tsx
index 56139fd69..c6abcc523 100644
--- a/src/components/DataTable/DataTablePatient.tsx
+++ b/src/components/DataTable/DataTablePatient.tsx
@@ -17,7 +17,6 @@ import { PatientTableLabels } from 'types/patient'
 import GenderIcon from 'components/ui/GenderIcon'
 import StatusChip, { ChipStyles } from 'components/ui/StatusChip'
 import { VitalStatusLabel } from 'types/requestCriterias'
-import { getExtension } from 'utils/fhir'
 import { AppConfig } from 'config'
 
 type DataTablePatientProps = {
@@ -144,8 +143,7 @@ const DataTablePatientLine: React.FC<{
         )}
       </TableCellWrapper>
       <TableCellWrapper align="left">
-        {getExtension(patient, appConfig.core.extensions.patientLastEnconterUrl)?.valueReference?.display ||
-          'Non renseigné'}
+        {patient.lastOrganization ? patient.lastOrganization.display : 'Non renseigné'}
       </TableCellWrapper>
       <TableCellWrapper>
         <StatusChip
diff --git a/src/components/DataTable/DataTablePmsi.tsx b/src/components/DataTable/DataTablePmsi.tsx
index 85c7c4e9a..8c76e9b92 100644
--- a/src/components/DataTable/DataTablePmsi.tsx
+++ b/src/components/DataTable/DataTablePmsi.tsx
@@ -14,6 +14,7 @@ import { getExtension } from 'utils/fhir'
 
 import useStyles from './styles'
 import { mapToDate, mapToLabelSingular } from 'mappers/pmsi'
+import { getPreferedCode } from 'utils/mappers'
 
 type DataTablePmsiProps = {
   loading: boolean
@@ -108,7 +109,7 @@ const DataTablePmsiLine: React.FC<{
 
   const filterCode = pmsi.resourceType === ResourceType.CLAIM ? pmsi.diagnosis?.[0]?.packageCode : pmsi.code
 
-  const codeToDisplay = filterCode?.coding?.find((code) => code.userSelected === true)
+  const codeToDisplay = getPreferedCode(filterCode)
 
   const source = pmsi.meta?.source ?? 'Non renseigné'
 
diff --git a/src/components/Patient/PatientBiology/PatientBiology.tsx b/src/components/Patient/PatientBiology/PatientBiology.tsx
index a42bd3348..d9ba1cb76 100644
--- a/src/components/Patient/PatientBiology/PatientBiology.tsx
+++ b/src/components/Patient/PatientBiology/PatientBiology.tsx
@@ -93,7 +93,7 @@ const PatientBiology = () => {
       filters: { nda, loinc, anabio, startDate, endDate, executiveUnits, validatedStatus, encounterStatus }
     },
     { changeOrderBy, changeSearchInput, addFilters, removeFilter, addSearchCriterias }
-  ] = useSearchCriterias(initBioSearchCriterias)
+  ] = useSearchCriterias(initBioSearchCriterias())
   const filtersAsArray = useMemo(() => {
     return selectFiltersAsArray({
       nda,
diff --git a/src/components/Patient/PatientMedication/PatientMedication.tsx b/src/components/Patient/PatientMedication/PatientMedication.tsx
index 06c478ee6..c799ce2de 100644
--- a/src/components/Patient/PatientMedication/PatientMedication.tsx
+++ b/src/components/Patient/PatientMedication/PatientMedication.tsx
@@ -106,7 +106,7 @@ const PatientMedication = () => {
       filters: { nda, prescriptionTypes, startDate, endDate, administrationRoutes, executiveUnits, encounterStatus }
     },
     { changeOrderBy, changeSearchInput, addFilters, removeFilter, removeSearchCriterias, addSearchCriterias }
-  ] = useSearchCriterias(initMedSearchCriterias)
+  ] = useSearchCriterias(initMedSearchCriterias(selectedTab.id))
   const filtersAsArray = useMemo(() => {
     return selectFiltersAsArray({
       nda,
@@ -422,7 +422,10 @@ const PatientMedication = () => {
                 filterName,
                 {
                   searchInput,
-                  orderBy: { orderBy: Order.PERIOD_START, orderDirection: Direction.DESC },
+                  orderBy: {
+                    orderBy: selectedTab.id === ResourceType.MEDICATION_REQUEST ? Order.DATE : Order.EFFECTIVE_TIME,
+                    orderDirection: Direction.DESC
+                  },
                   filters: {
                     nda,
                     prescriptionTypes,
diff --git a/src/components/Patient/PatientPMSI/PatientPMSI.tsx b/src/components/Patient/PatientPMSI/PatientPMSI.tsx
index ac3489b22..2a288830e 100644
--- a/src/components/Patient/PatientPMSI/PatientPMSI.tsx
+++ b/src/components/Patient/PatientPMSI/PatientPMSI.tsx
@@ -43,6 +43,7 @@ import { Hierarchy } from 'types/hierarchy'
 import { useSearchParams } from 'react-router-dom'
 import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
 import { getPMSITab } from 'utils/tabsUtils'
+import { getConfig } from 'config'
 
 type PmsiSearchResults = {
   deidentified: boolean
@@ -52,10 +53,12 @@ type PmsiSearchResults = {
   label: PMSILabel
 }
 
-export const PMSITabs: PmsiTab[] = [
+export const PMSITabs: () => PmsiTab[] = () => [
   { label: PMSILabel.DIAGNOSTIC, id: ResourceType.CONDITION },
   { label: PMSILabel.CCAM, id: ResourceType.PROCEDURE },
-  { label: PMSILabel.GHM, id: ResourceType.CLAIM }
+  ...(getConfig().features.claim.enabled
+    ? ([{ label: PMSILabel.GHM, id: ResourceType.CLAIM }] as PmsiTab[])
+    : ([] as PmsiTab[]))
 ]
 
 const PatientPMSI = () => {
@@ -288,7 +291,7 @@ const PatientPMSI = () => {
           <Grid container alignItems="center">
             <Grid item xs={12} md={12} lg={4} xl={4}>
               <Tabs
-                values={PMSITabs}
+                values={PMSITabs()}
                 active={selectedTab}
                 onchange={(value: PmsiTab) => {
                   setOldTabs(selectedTab)
diff --git a/src/components/Patient/PatientPreview/PatientPreview.tsx b/src/components/Patient/PatientPreview/PatientPreview.tsx
index e1dd1e79d..12705e0a6 100644
--- a/src/components/Patient/PatientPreview/PatientPreview.tsx
+++ b/src/components/Patient/PatientPreview/PatientPreview.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import React, { useContext, useEffect } from 'react'
 import { useSearchParams } from 'react-router-dom'
 
 import { Grid, Paper } from '@mui/material'
@@ -11,6 +11,8 @@ import { getLastDiagnosisLabels } from 'utils/pmsi'
 import { CohortPatient, IPatientDetails } from 'types'
 
 import useStyles from './styles'
+import { getPreferedCode } from 'utils/mappers'
+import { AppConfig } from 'config'
 
 type PatientPreviewProps = {
   patient?: IPatientDetails
@@ -18,6 +20,7 @@ type PatientPreviewProps = {
 }
 const PatientPreview: React.FC<PatientPreviewProps> = ({ patient, deidentifiedBoolean }) => {
   const { classes } = useStyles()
+  const appConfig = useContext(AppConfig)
   const [searchParams, setSearchParams] = useSearchParams()
   const groupId = searchParams.get('groupId') ?? undefined
 
@@ -61,7 +64,7 @@ const PatientPreview: React.FC<PatientPreviewProps> = ({ patient, deidentifiedBo
   const lastProcedure = patient.lastProcedure
     ? patient.lastProcedure === 'loading'
       ? 'loading'
-      : patient.lastProcedure?.code?.coding?.find((code) => code.userSelected === true)?.display
+      : getPreferedCode(patient.lastProcedure?.code)?.display
     : '-'
   const lastGhm = patient.lastGhm
     ? patient.lastGhm === 'loading'
@@ -81,7 +84,7 @@ const PatientPreview: React.FC<PatientPreviewProps> = ({ patient, deidentifiedBo
           <PatientField fieldName="Dernière prise en charge" fieldValue={lastEncounter} />
           <PatientField fieldName="Durée de prise en charge" fieldValue={lastEncounterDuration} />
           <PatientField fieldName="Dernier acte" fieldValue={lastProcedure} />
-          <PatientField fieldName="Dernier GHM" fieldValue={lastGhm} />
+          {appConfig.features.claim.enabled && <PatientField fieldName="Dernier GHM" fieldValue={lastGhm} />}
         </Grid>
       </Grid>
     </Grid>
diff --git a/src/components/Patient/PatientSidebar/PatientSidebar.tsx b/src/components/Patient/PatientSidebar/PatientSidebar.tsx
index 5e2a9bbf1..89d723495 100644
--- a/src/components/Patient/PatientSidebar/PatientSidebar.tsx
+++ b/src/components/Patient/PatientSidebar/PatientSidebar.tsx
@@ -70,7 +70,7 @@ const PatientSidebar = ({ total, patients, openDrawer, onClose, deidentifiedBool
       filters: { genders, birthdatesRanges, vitalStatuses }
     },
     { changeOrderBy, changeSearchInput, changeSearchBy, addFilters, removeFilter }
-  ] = useSearchCriterias(initPatientsSearchCriterias)
+  ] = useSearchCriterias(initPatientsSearchCriterias())
 
   const filtersAsArray = useMemo(() => {
     return selectFiltersAsArray({ genders, vitalStatuses, birthdatesRanges })
@@ -148,7 +148,7 @@ const PatientSidebar = ({ total, patients, openDrawer, onClose, deidentifiedBool
                 value={searchBy || SearchByTypes.TEXT}
                 label="Rechercher dans :"
                 width={'40%'}
-                items={searchByListPatients}
+                items={searchByListPatients()}
                 onchange={(newValue: SearchByTypes) => changeSearchBy(newValue)}
               />
             )}
diff --git a/src/components/Patient/PatientTimeline/TimelineItemRightProcedure.tsx b/src/components/Patient/PatientTimeline/TimelineItemRightProcedure.tsx
index d5b4f916d..cf78b798a 100644
--- a/src/components/Patient/PatientTimeline/TimelineItemRightProcedure.tsx
+++ b/src/components/Patient/PatientTimeline/TimelineItemRightProcedure.tsx
@@ -3,6 +3,7 @@ import React from 'react'
 import useStyles from './styles'
 import { PMSIEntry } from 'types'
 import { Procedure } from 'fhir/r4'
+import { getPreferedCode } from 'utils/mappers'
 
 /**
  * @usage
@@ -35,7 +36,7 @@ const TimelineItemRight: React.FC<TimelineItemRightTypes> = ({ data }) => {
 
   const { classes } = useStyles({ color: color })
 
-  const codeToDisplay = data.code?.coding?.find((code) => code.userSelected === true)
+  const codeToDisplay = getPreferedCode(data.code)
 
   return (
     <li className={classes.timelineItem}>
diff --git a/src/components/ScopeTree/ScopeTreeTable.tsx b/src/components/ScopeTree/ScopeTreeTable.tsx
index 9b15e45ca..a707d4672 100644
--- a/src/components/ScopeTree/ScopeTreeTable.tsx
+++ b/src/components/ScopeTree/ScopeTreeTable.tsx
@@ -22,7 +22,7 @@ import useStyles from './styles'
 import { SourceType } from 'types/scope'
 import { sort } from 'utils/arrays'
 import { v4 as uuidv4 } from 'uuid'
-import { isSourceTypeInScopeLevel } from 'utils/perimeters'
+import { isSourceTypeInScopeLevel, perimeterDisplay } from 'utils/perimeters'
 import { every } from 'lodash'
 
 type HierarchyItemProps = {
@@ -101,9 +101,9 @@ const ScopeTreeRow = ({ item, path, sourceType, searchMode, loading, onSelect, o
         )}
         {!searchMode && (
           <TableCell style={{ cursor: 'pointer' }}>
-            <Typography
-              onClick={() => (open ? setOpen(false) : handleOpen())}
-            >{`${source_value} - ${name}`}</Typography>
+            <Typography onClick={() => (open ? setOpen(false) : handleOpen())}>
+              {perimeterDisplay(source_value, name)}
+            </Typography>
           </TableCell>
         )}
         <TableCell align="center">
diff --git a/src/components/ScopeTree/SelectedCodes.tsx b/src/components/ScopeTree/SelectedCodes.tsx
index 74a22241c..dd0fa1841 100644
--- a/src/components/ScopeTree/SelectedCodes.tsx
+++ b/src/components/ScopeTree/SelectedCodes.tsx
@@ -5,6 +5,7 @@ import Chip from 'components/ui/Chip'
 import { KeyboardArrowDown, KeyboardArrowUp } from '@mui/icons-material'
 import { ScopeElement } from 'types'
 import { Hierarchy } from 'types/hierarchy'
+import { perimeterDisplay } from 'utils/perimeters'
 
 type SelectedCodesProps<T> = {
   values: Hierarchy<ScopeElement, T>[]
@@ -44,7 +45,7 @@ const SelectedCodes = <T,>({ values, onDelete }: SelectedCodesProps<T>) => {
                 <Chip
                   key={code.id}
                   style={{ backgroundColor: '#D1E2F4', color: '153D8A important!' }}
-                  label={`${code.source_value} - ${code.name}`}
+                  label={perimeterDisplay(code.source_value, code.name)}
                   onDelete={() => onDelete(code)}
                 />
               ))}
diff --git a/src/components/ui/Inputs/ExecutiveUnit/index.tsx b/src/components/ui/Inputs/ExecutiveUnit/index.tsx
index 5adb53530..b19cd943a 100644
--- a/src/components/ui/Inputs/ExecutiveUnit/index.tsx
+++ b/src/components/ui/Inputs/ExecutiveUnit/index.tsx
@@ -9,7 +9,7 @@ import { SourceType } from 'types/scope'
 import PopulationRightPanel from 'components/CreationCohort/DiagramView/components/PopulationCard/components/PopulationRightPanel'
 import { Hierarchy } from 'types/hierarchy'
 import servicesPerimeters from 'services/aphp/servicePerimeters'
-import { getScopeLevelBySourceType } from 'utils/perimeters'
+import { getScopeLevelBySourceType, perimeterDisplay } from 'utils/perimeters'
 import { CriteriaLabel } from 'components/ui/CriteriaLabel'
 
 type ExecutiveUnitsFilterProps = {
@@ -77,7 +77,7 @@ const ExecutiveUnitsInput = ({ value, sourceType, disabled = false, onChange, la
                   marginTop: '4px'
                 }}
                 key={unit.id}
-                label={`${unit.source_value} - ${unit.name}`}
+                label={perimeterDisplay(unit.source_value, unit.name)}
                 onDelete={() => {
                   handleDelete(unit.id)
                 }}
diff --git a/src/config.tsx b/src/config.tsx
index d42062635..97e3824eb 100644
--- a/src/config.tsx
+++ b/src/config.tsx
@@ -26,6 +26,8 @@ type AppConfig = {
         biologyHierarchyAnabio: ValueSetConfig
         biologyHierarchyLoinc: ValueSetConfig
       }
+      useObservationValueRestriction: boolean
+      useObservationDefaultValidated: boolean
     }
     medication: {
       enabled: boolean
@@ -36,6 +38,7 @@ type AppConfig = {
         medicationPrescriptionTypes: ValueSetConfig
         medicationUcd: ValueSetConfig
       }
+      useMedicationAtcUcdCodes: boolean
     }
     condition: {
       enabled: boolean
@@ -142,6 +145,17 @@ type AppConfig = {
       patientTotalAgeDaysExtensionUrl?: string
       patientTotalAgeMonthsExtensionUrl?: string
     }
+    fhir: {
+      valueSetExploration: boolean
+      facetsExtensions: boolean
+      filterActive: boolean
+      totalCount: boolean
+      selectedCodeOnly: boolean
+      extraSearchParams: boolean
+      resourceLists: boolean
+      textSearch: boolean
+      valuesetExpansion: boolean
+    }
   }
   system: {
     wsProtocol: string
@@ -176,6 +190,17 @@ let config: AppConfig = {
     codeSystems: {
       docStatus: 'http://hl7.org/fhir/CodeSystem/composition-status'
     },
+    fhir: {
+      valueSetExploration: true,
+      facetsExtensions: true,
+      filterActive: true,
+      totalCount: false,
+      selectedCodeOnly: true,
+      extraSearchParams: true,
+      resourceLists: true,
+      textSearch: true,
+      valuesetExpansion: true
+    },
     valueSets: {
       demographicGender: { url: '' },
       encounterAdmission: { url: '' },
@@ -206,7 +231,9 @@ let config: AppConfig = {
       valueSets: {
         biologyHierarchyAnabio: { url: '' },
         biologyHierarchyLoinc: { url: '' }
-      }
+      },
+      useObservationValueRestriction: true,
+      useObservationDefaultValidated: true
     },
     medication: {
       enabled: true,
@@ -216,7 +243,8 @@ let config: AppConfig = {
         medicationAtcOrbis: { url: '' },
         medicationPrescriptionTypes: { url: '' },
         medicationUcd: { url: '' }
-      }
+      },
+      useMedicationAtcUcdCodes: true
     },
     condition: {
       enabled: true,
diff --git a/src/constants.js b/src/constants.js
index 7a79f9ffc..4687d390f 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -8,3 +8,5 @@ export const REFRESH_TOKEN = 'refresh_token'
 export const IMPERSONATED_USER = 'impersonated_user'
 
 export const EXPLORATION = 'Exploration'
+
+export const USE_FHIR_ENCOUNTER_CARE_SITE = false
diff --git a/src/mappers/filters.ts b/src/mappers/filters.ts
index 291cf546e..0ce471d9a 100644
--- a/src/mappers/filters.ts
+++ b/src/mappers/filters.ts
@@ -474,7 +474,10 @@ const mapAdministrationToRequestParams = (filters: MedicationFilters) => {
 
 const mapBiologyToRequestParams = (filters: BiologyFilters) => {
   const { anabio, loinc, validatedStatus, nda, endDate, startDate, executiveUnits, encounterStatus } = filters
-  const requestParams: string[] = ['value-quantity=ge0,le0', 'subject.active=true']
+  const appConfig = getConfig()
+  const requestParams: string[] = []
+  if (appConfig.core.fhir.filterActive) requestParams.push('subject.active=true')
+  if (appConfig.features.observation.useObservationValueRestriction) requestParams.push('value-quantity=ge0,le0')
   if ((anabio && anabio.length > 0) || (loinc && loinc.length > 0)) {
     const key = `${ObservationParamsKeys.ANABIO_LOINC}=`
     let _anabio = ''
@@ -587,9 +590,13 @@ const getDefaultOrderBy = (type: ResourceType) => {
         orderDirection: Direction.DESC
       }
     case ResourceType.MEDICATION_REQUEST:
+      return {
+        orderBy: Order.DATE,
+        orderDirection: Direction.DESC
+      }
     case ResourceType.MEDICATION_ADMINISTRATION:
       return {
-        orderBy: Order.PERIOD_START,
+        orderBy: Order.EFFECTIVE_TIME,
         orderDirection: Direction.DESC
       }
     case ResourceType.OBSERVATION:
@@ -645,7 +652,7 @@ const mapSearchByAndSearchInputFromRequestParams = (parameters: URLSearchParams)
   return [searchBy, searchInput]
 }
 
-function mapBirthdatesRangesFromRequestParams(key: PatientsParamsKeys, parameters: URLSearchParams): DurationRangeType {
+function mapBirthdatesRangesFromRequestParams(key: string, parameters: URLSearchParams): DurationRangeType {
   const birthdatesRanges: DurationRangeType = [null, null]
   const dates = parameters.getAll(key)
   dates.forEach((date) => {
diff --git a/src/reducers/searchCriteriasReducer.ts b/src/reducers/searchCriteriasReducer.ts
index 1e09667aa..0824b3050 100644
--- a/src/reducers/searchCriteriasReducer.ts
+++ b/src/reducers/searchCriteriasReducer.ts
@@ -20,6 +20,8 @@ import {
   MaternityFormFilters
 } from 'types/searchCriterias'
 import { CohortsType } from 'types/cohorts'
+import { ResourceType } from 'types/requestCriterias'
+import { getConfig } from 'config'
 
 export const initCohortsSearchCriterias: SearchCriterias<CohortsFilters> = {
   orderBy: {
@@ -47,19 +49,19 @@ export const initSearchPatientsSearchCriterias: SearchCriterias<null> = {
   filters: null
 }
 
-export const initPatientsSearchCriterias: SearchCriterias<PatientsFilters> = {
+export const initPatientsSearchCriterias: () => SearchCriterias<PatientsFilters> = () => ({
   orderBy: {
     orderBy: Order.FAMILY,
     orderDirection: Direction.ASC
   },
   searchInput: '',
-  searchBy: SearchByTypes.TEXT,
+  searchBy: getConfig().core.fhir.textSearch ? SearchByTypes.TEXT : SearchByTypes.FAMILY,
   filters: {
     genders: [],
     birthdatesRanges: [null, null],
     vitalStatuses: []
   }
-}
+})
 
 export const initPmsiSearchCriterias: SearchCriterias<PMSIFilters> = {
   orderBy: {
@@ -81,9 +83,11 @@ export const initPmsiSearchCriterias: SearchCriterias<PMSIFilters> = {
   }
 }
 
-export const initMedSearchCriterias: SearchCriterias<MedicationFilters> = {
+export const initMedSearchCriterias: (
+  medType: ResourceType.MEDICATION_REQUEST | ResourceType.MEDICATION_ADMINISTRATION
+) => SearchCriterias<MedicationFilters> = (medType) => ({
   orderBy: {
-    orderBy: Order.PERIOD_START,
+    orderBy: medType === ResourceType.MEDICATION_REQUEST ? Order.DATE : Order.EFFECTIVE_TIME,
     orderDirection: Direction.DESC
   },
   searchInput: '',
@@ -98,9 +102,9 @@ export const initMedSearchCriterias: SearchCriterias<MedicationFilters> = {
     prescriptionTypes: [],
     encounterStatus: []
   }
-}
+})
 
-export const initBioSearchCriterias: SearchCriterias<BiologyFilters> = {
+export const initBioSearchCriterias: () => SearchCriterias<BiologyFilters> = () => ({
   orderBy: {
     orderBy: Order.DATE,
     orderDirection: Direction.ASC
@@ -108,7 +112,7 @@ export const initBioSearchCriterias: SearchCriterias<BiologyFilters> = {
   searchInput: '',
   searchBy: SearchByTypes.TEXT,
   filters: {
-    validatedStatus: true,
+    validatedStatus: getConfig().features.observation.useObservationDefaultValidated,
     nda: '',
     loinc: [],
     anabio: [],
@@ -117,7 +121,7 @@ export const initBioSearchCriterias: SearchCriterias<BiologyFilters> = {
     executiveUnits: [],
     encounterStatus: []
   }
-}
+})
 
 export const initPatientDocsSearchCriterias: SearchCriterias<DocumentsFilters> = {
   orderBy: {
diff --git a/src/services/aphp/callApi.ts b/src/services/aphp/callApi.ts
index 0efff21af..04c6cd068 100644
--- a/src/services/aphp/callApi.ts
+++ b/src/services/aphp/callApi.ts
@@ -116,13 +116,15 @@ export const fetchPatient = async (args: fetchPatientProps): FHIR_Bundle_Promise
   } = args
   const _sortDirection = sortDirection === Direction.DESC ? '-' : ''
   let { _list, pivotFacet, _elements } = args
+  const appConfig = getConfig()
 
   _list = _list ? _list.filter(uniq) : []
   pivotFacet = pivotFacet ? pivotFacet.filter(uniq) : []
   _elements = _elements ? _elements.filter(uniq) : []
 
   // By default, all the calls to `/Patient` will have 'active=true' in parameter
-  let options: string[] = ['active=true']
+  let options: string[] = appConfig.core.fhir.filterActive ? ['active=true'] : []
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (_id) options = [...options, `_id=${_id}`]
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset) options = [...options, `_offset=${offset}`]
@@ -141,8 +143,8 @@ export const fetchPatient = async (args: fetchPatientProps): FHIR_Bundle_Promise
       `${deidentified ? PatientsParamsKeys.DATE_DEIDENTIFIED : PatientsParamsKeys.DATE_IDENTIFIED}=le${maxBirthdate}`
     ]
 
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
-  if (pivotFacet && pivotFacet.length > 0)
+  if (!_id && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
+  if (appConfig.core.fhir.facetsExtensions && pivotFacet && pivotFacet.length > 0)
     options = [...options, `pivot-facet=${pivotFacet.reduce(paramValuesReducer, '')}`]
   if (_elements && _elements.length > 0) options = [...options, `_elements=${_elements.reduce(paramValuesReducer, '')}`]
 
@@ -176,6 +178,7 @@ export const fetchEncounter = async (args: fetchEncounterProps): FHIR_Bundle_Pro
   const { _id, size, offset, _sort, sortDirection, patient, visit, signal } = args
   const _sortDirection = sortDirection === Direction.DESC ? '-' : ''
   let { _list, _elements, status, facet } = args
+  const appConfig = getConfig()
 
   _list = _list ? _list.filter(uniq) : []
   status = status ? status.filter(uniq) : []
@@ -183,17 +186,19 @@ export const fetchEncounter = async (args: fetchEncounterProps): FHIR_Bundle_Pro
   facet = facet ? facet.filter(uniq) : []
 
   // By default, all the calls to `/Encounter` will have 'subject.active=true' in parameter
-  let options: string[] = ['subject.active=true']
+  let options: string[] = appConfig.core.fhir.filterActive ? ['subject.active=true'] : []
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (_id) options = [...options, `_id=${_id}`]
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset) options = [...options, `_offset=${offset}`]
-  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort},id`]
+  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort}`]
   if (patient) options = [...options, `subject=${patient}`]
 
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
+  if (!patient && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
   if (status && status.length > 0) options = [...options, `status=${status.reduce(paramValuesReducer)}`]
   if (_elements && _elements.length > 0) options = [...options, `_elements=${_elements.reduce(paramValuesReducer, '')}`]
-  if (facet && facet.length > 0) options = [...options, `facet=${facet.reduce(paramValuesReducer, '')}`]
+  if (appConfig.core.fhir.facetsExtensions && facet && facet.length > 0)
+    options = [...options, `facet=${facet.reduce(paramValuesReducer, '')}`]
   if (visit !== undefined) options = [...options, `part-of:missing=${visit}`]
 
   const response = await apiFhir.get<FHIR_Bundle_Response<Encounter>>(`/Encounter?${options.reduce(paramsReducer)}`, {
@@ -276,6 +281,7 @@ export const fetchDocumentReference = async (
   let { _list, facet, uniqueFacet, _elements } = args
   const encounterIdentifier = args['encounter-identifier']
   const patientIdentifier = args['patient-identifier']
+  const appConfig = getConfig()
 
   _list = _list ? _list.filter(uniq) : []
   facet = facet ? facet.filter(uniq) : []
@@ -287,13 +293,14 @@ export const fetchDocumentReference = async (
     `type:not=${encodeURIComponent(
       'https://terminology.eds.aphp.fr/aphp-orbis-document-textuel-hospitalier|doc-impor'
     )}`,
-    `contenttype=${encodeURIComponent('text/plain')}`,
-    'subject.active=true'
+    `contenttype=${encodeURIComponent('text/plain')}`
   ]
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
+  if (appConfig.core.fhir.filterActive) options = [...options, 'patient.active=true']
   if (_id) options = [...options, `_id=${_id}`]
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset) options = [...options, `_offset=${offset}`]
-  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort},id`]
+  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort}`]
   if (type) options = [...options, `${DocumentsParamsKeys.DOC_TYPES}=${type}`]
   if (_text)
     options = [...options, `${searchBy === SearchByTypes.TEXT ? `_text` : 'description'}=${encodeURIComponent(_text)}`]
@@ -325,9 +332,10 @@ export const fetchDocumentReference = async (
   if (encounterStatus && encounterStatus.length > 0)
     options = [...options, `${DocumentsParamsKeys.ENCOUNTER_STATUS}=${encounterStatus}`]
 
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
-  if (facet && facet.length > 0) options = [...options, `facet=${facet.reduce(paramValuesReducer, '')}`]
-  if (uniqueFacet && uniqueFacet.length > 0)
+  if (!patient && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
+  if (appConfig.core.fhir.facetsExtensions && facet && facet.length > 0)
+    options = [...options, `facet=${facet.reduce(paramValuesReducer, '')}`]
+  if (appConfig.core.fhir.facetsExtensions && uniqueFacet && uniqueFacet.length > 0)
     options = [...options, `unique-facet=${uniqueFacet.reduce(paramValuesReducer, '')}`]
   if (_elements && _elements.length > 0) options = [...options, `_elements=${_elements.reduce(paramValuesReducer, '')}`]
 
@@ -483,18 +491,20 @@ export const fetchProcedure = async (args: fetchProcedureProps): FHIR_Bundle_Pro
   let { _list, uniqueFacet } = args
   const encounterIdentifier = args['encounter-identifier']
   const patientIdentifier = args['patient-identifier']
+  const appConfig = getConfig()
 
   _list = _list ? _list.filter(uniq) : []
   uniqueFacet = uniqueFacet ? uniqueFacet.filter(uniq) : []
 
   // By default, all the calls to `/Procedure` will have 'patient.active=true' in parameter
-  let options: string[] = ['subject.active=true']
+  let options: string[] = appConfig.core.fhir.filterActive ? ['subject.active=true'] : []
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (size !== undefined) options = [...options, `_count=${size}`] // eslint-disable-line
   if (offset) options = [...options, `_offset=${offset}`] // eslint-disable-line
-  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort},id`] // eslint-disable-line
+  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort}`] // eslint-disable-line
   if (subject) options = [...options, `subject=${subject}`] // eslint-disable-line
   if (code) options = [...options, `${ProcedureParamsKeys.CODE}=${code}`] // eslint-disable-line
-  if (source) options = [...options, `${ProcedureParamsKeys.SOURCE}=${source}`]
+  if (appConfig.core.fhir.extraSearchParams && source) options = [...options, `${ProcedureParamsKeys.SOURCE}=${source}`]
   if (_text) options = [...options, `_text=${encodeURIComponent(_text)}&_tag=${lowToleranceTag}`]
   if (status) options = [...options, `status=${encodeURIComponent(`${docStatusCodeSystem}|${status}`)}`]
   if (encounterIdentifier) options = [...options, `${ProcedureParamsKeys.NDA}=${encounterIdentifier}`]
@@ -556,15 +566,17 @@ export const fetchClaim = async (args: fetchClaimProps): FHIR_Bundle_Promise_Res
   let { _list, uniqueFacet } = args
   const encounterIdentifier = args['encounter-identifier']
   const patientIdentifier = args['patient-identifier']
+  const appConfig = getConfig()
 
   _list = _list ? _list.filter(uniq) : []
   uniqueFacet = uniqueFacet ? uniqueFacet.filter(uniq) : []
 
   // By default, all the calls to `/Claim` will have 'patient.active=true' in parameter
-  let options: string[] = ['patient.active=true']
+  let options: string[] = appConfig.core.fhir.filterActive ? ['patient.active=true'] : []
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (size !== undefined) options = [...options, `_count=${size}`] // eslint-disable-line
   if (offset) options = [...options, `_offset=${offset}`] // eslint-disable-line
-  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort},id`] // eslint-disable-line
+  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort}`] // eslint-disable-line
   if (patient) options = [...options, `patient=${patient}`] // eslint-disable-line
   if (diagnosis) options = [...options, `${ClaimParamsKeys.CODE}=${diagnosis}`] // eslint-disable-line
   if (_text) options = [...options, `_text=${encodeURIComponent(_text)}&_tag=${lowToleranceTag}`] // eslint-disable-line
@@ -579,7 +591,7 @@ export const fetchClaim = async (args: fetchClaimProps): FHIR_Bundle_Promise_Res
   if (uniqueFacet && uniqueFacet.length > 0)
     options = [...options, `unique-facet=${uniqueFacet.reduce(paramValuesReducer, '')}`]
 
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
+  if (!patient && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
 
   const response = await apiFhir.get<FHIR_Bundle_Response<Claim>>(`/Claim?${options.reduce(paramsReducer)}`, {
     signal: args.signal
@@ -621,19 +633,20 @@ export const fetchCondition = async (args: fetchConditionProps): FHIR_Bundle_Pro
   const patientIdentifier = args['patient-identifier']
   const minRecordedDate = args['min-recorded-date']
   const maxRecordedDate = args['max-recorded-date']
-
+  const appConfig = getConfig()
   _list = _list ? _list.filter(uniq) : []
   uniqueFacet = uniqueFacet ? uniqueFacet.filter(uniq) : []
   type = type ? type.filter(uniq) : []
 
   // By default, all the calls to `/Condition` will have 'patient.active=true' in parameter
-  let options: string[] = ['subject.active=true']
+  let options: string[] = appConfig.core.fhir.filterActive ? ['subject.active=true'] : []
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (size !== undefined) options = [...options, `_count=${size}`] // eslint-disable-line
   if (offset !== undefined) options = [...options, `_offset=${offset}`] // eslint-disable-line
-  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort},id`] // eslint-disable-line
+  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort}`] // eslint-disable-line
   if (subject) options = [...options, `subject=${subject}`] // eslint-disable-line
   if (code) options = [...options, `${ConditionParamsKeys.CODE}=${code}`] // eslint-disable-line
-  if (source) options = [...options, `${ConditionParamsKeys.SOURCE}=${source}`]
+  if (appConfig.core.fhir.extraSearchParams && source) options = [...options, `${ConditionParamsKeys.SOURCE}=${source}`]
   if (_text) options = [...options, `_text=${encodeURIComponent(_text)}&_tag=${lowToleranceTag}`] // eslint-disable-line
   if (encounterIdentifier) options = [...options, `${ConditionParamsKeys.NDA}=${encounterIdentifier}`] // eslint-disable-line
   if (patientIdentifier) options = [...options, `${ConditionParamsKeys.IPP}=${patientIdentifier}`]
@@ -646,9 +659,9 @@ export const fetchCondition = async (args: fetchConditionProps): FHIR_Bundle_Pro
   if (uniqueFacet && uniqueFacet.length > 0)
     options = [...options, `unique-facet=${uniqueFacet.reduce(paramValuesReducer, '')}`]
 
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`] // eslint-disable-line
-  if (type && type.length > 0) {
-    const diagnosticTypesUrl = `${getConfig().features.condition.valueSets.conditionStatus.url}|`
+  if (!subject && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`] // eslint-disable-line
+  if (appConfig.core.fhir.extraSearchParams && type && type.length > 0) {
+    const diagnosticTypesUrl = appConfig.features.condition.valueSets.conditionStatus.url + '|'
     const urlString = type.map((id) => diagnosticTypesUrl + id).join(',')
     options = [...options, `${ConditionParamsKeys.DIAGNOSTIC_TYPES}=${encodeURIComponent(urlString)}`]
   }
@@ -703,16 +716,21 @@ export const fetchObservation = async (args: fetchObservationProps): FHIR_Bundle
   const _sortDirection = sortDirection === Direction.DESC ? '-' : ''
   let { _list, uniqueFacet } = args
   const patientIdentifier = args['patient-identifier']
+  const appConfig = getConfig()
 
   _list = _list ? _list.filter(uniq) : []
   uniqueFacet = uniqueFacet ? uniqueFacet.filter(uniq) : []
 
   // By default, all the calls to `/Observation` will have 'value-quantity-value=ge0,le0' and 'patient.active=true' in the parameters
-  let options: string[] = [`${ObservationParamsKeys.VALUE}=ge0,le0`, 'subject.active=true']
+  let options: string[] = []
+  if (appConfig.features.observation.useObservationValueRestriction)
+    options = [...options, `${ObservationParamsKeys.VALUE}=ge0,le0`]
+  if (appConfig.core.fhir.filterActive) options = [...options, 'subject.active=true']
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (id) options = [...options, `_id=${id}`]
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset) options = [...options, `_offset=${offset}`]
-  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort.includes('code') ? _sort : `${_sort},id`}`]
+  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort.includes('code') ? _sort : `${_sort}`}`]
   if (_text) options = [...options, `_text=${encodeURIComponent(_text)}&_tag=${lowToleranceTag}`]
   if (encounter) options = [...options, `${ObservationParamsKeys.NDA}=${encounter}`]
   if (anabio || loinc)
@@ -723,7 +741,7 @@ export const fetchObservation = async (args: fetchObservationProps): FHIR_Bundle
   if (subject) options = [...options, `subject=${subject}`] // eslint-disable-line
   if (minDate) options = [...options, `${ObservationParamsKeys.DATE}=ge${minDate}`] // eslint-disable-line
   if (maxDate) options = [...options, `${ObservationParamsKeys.DATE}=le${maxDate}`] // eslint-disable-line
-  if (rowStatus) options = [...options, `${ObservationParamsKeys.VALIDATED_STATUS}=${BiologyStatus.VALIDATED}`] // eslint-disable-line
+  if (appConfig.core.fhir.extraSearchParams && rowStatus) options = [...options, `${ObservationParamsKeys.VALIDATED_STATUS}=${BiologyStatus.VALIDATED}`] // eslint-disable-line
   if (executiveUnits && executiveUnits.length > 0)
     options = [...options, `${ObservationParamsKeys.EXECUTIVE_UNITS}=${executiveUnits}`]
   if (encounterStatus && encounterStatus.length > 0)
@@ -732,7 +750,7 @@ export const fetchObservation = async (args: fetchObservationProps): FHIR_Bundle
   if (uniqueFacet && uniqueFacet.length > 0)
     options = [...options, `unique-facet=${uniqueFacet.reduce(paramValuesReducer, '')}`]
 
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
+  if (!subject && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
 
   const response = await apiFhir.get<FHIR_Bundle_Response<Observation>>(
     `/Observation?${options.reduce(paramsReducer)}`,
@@ -784,16 +802,18 @@ export const fetchMedicationRequest = async (
   } = args
   const _sortDirection = sortDirection === Direction.DESC ? '-' : ''
   let { _list, uniqueFacet } = args
+  const appConfig = getConfig()
 
   _list = _list ? _list.filter(uniq) : []
   uniqueFacet = uniqueFacet ? uniqueFacet.filter(uniq) : []
 
   // By default, all the calls to `/MedicationRequest` will have 'patient.active=true' in parameter
-  let options: string[] = ['subject.active=true']
+  let options: string[] = appConfig.core.fhir.filterActive ? ['subject.active=true'] : []
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (id) options = [...options, `_id=${id}`]
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset !== undefined) options = [...options, `_offset=${offset}`]
-  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort},id`]
+  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort}`]
   if (subject) options = [...options, `subject=${subject}`]
   if (encounter) options = [...options, `${PrescriptionParamsKeys.NDA}=${encounter}`]
   if (_text) options = [...options, `_text=${encodeURIComponent(_text)}&_tag=${lowToleranceTag}`]
@@ -811,7 +831,7 @@ export const fetchMedicationRequest = async (
   if (uniqueFacet && uniqueFacet.length > 0)
     options = [...options, `unique-facet=${uniqueFacet.reduce(paramValuesReducer, '')}`]
 
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
+  if (!subject && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
 
   const response = await apiFhir.get<FHIR_Bundle_Response<MedicationRequest>>(
     `/MedicationRequest?${options.reduce(paramsReducer)}`,
@@ -862,16 +882,18 @@ export const fetchMedicationAdministration = async (
   } = args
   const _sortDirection = sortDirection === Direction.DESC ? '-' : ''
   let { _list, uniqueFacet } = args
+  const appConfig = getConfig()
 
   _list = _list ? _list.filter(uniq) : []
   uniqueFacet = uniqueFacet ? uniqueFacet.filter(uniq) : []
 
   // By default, all the calls to `/MedicationAdministration` will have 'patient.active=true' in parameter
-  let options: string[] = ['subject.active=true']
+  let options: string[] = appConfig.core.fhir.filterActive ? ['subject.active=true'] : []
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (id) options = [...options, `_id=${id}`]
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset) options = [...options, `_offset=${offset}`]
-  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort},id`]
+  if (_sort) options = [...options, `_sort=${_sortDirection}${_sort}`]
   if (subject) options = [...options, `subject=${subject}`]
   if (encounter) options = [...options, `${AdministrationParamsKeys.NDA}=${encounter}`]
   if (_text) options = [...options, `_text=${encodeURIComponent(_text)}&_tag=${lowToleranceTag}`]
@@ -889,7 +911,7 @@ export const fetchMedicationAdministration = async (
   if (uniqueFacet && uniqueFacet.length > 0)
     options = [...options, `unique-facet=${uniqueFacet.reduce(paramValuesReducer, '')}`]
 
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
+  if (!subject && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
 
   const response = await apiFhir.get<FHIR_Bundle_Response<MedicationAdministration>>(
     `/MedicationAdministration?${options.reduce(paramsReducer)}`,
@@ -938,11 +960,14 @@ export const fetchImaging = async (args: fetchImagingProps): FHIR_Bundle_Promise
   } = args
   const _orderDirection = orderDirection === Direction.DESC ? '-' : ''
   let { _list, uniqueFacet } = args
+  const appConfig = getConfig()
+
   _list = _list ? _list.filter(uniq) : []
   uniqueFacet = uniqueFacet ? uniqueFacet.filter(uniq) : []
 
   // By default, all the calls to `/ImagingStudy` will have 'patient.active=true' in parameter
-  let options: string[] = ['patient.active=true']
+  let options: string[] = appConfig.core.fhir.filterActive ? ['patient.active=true'] : []
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (patient) options = [...options, `patient=${patient}`]
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset) options = [...options, `_offset=${offset}`]
@@ -1008,13 +1033,15 @@ export const fetchForms = async (args: fetchFormsProps) => {
     signal
   } = args
   let { uniqueFacet } = args
+  const appConfig = getConfig()
   uniqueFacet = uniqueFacet ? uniqueFacet.filter(uniq) : []
   const _orderDirection = orderDirection === Direction.DESC ? '-' : ''
 
   let options: string[] = ['status=in-progress,completed']
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (patient) options = [...options, `subject=${patient}`]
   if (formName) options = [...options, `${QuestionnaireResponseParamsKeys.NAME}=${formName}`]
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
+  if (!patient && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
   if (startDate) options = [...options, `${QuestionnaireResponseParamsKeys.DATE}=ge${startDate}`]
   if (endDate) options = [...options, `${QuestionnaireResponseParamsKeys.DATE}=le${endDate}`]
   if (executiveUnits && executiveUnits.length > 0)
@@ -1067,8 +1094,9 @@ type fetchLocationProps = {
 }
 export const fetchLocation = async (args: fetchLocationProps) => {
   const { _list, _elements, near, size, offset, signal } = args
-
+  const appConfig = getConfig()
   let options: string[] = []
+  if (appConfig.core.fhir.totalCount) options = [...options, '_total=accurate']
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset) options = [...options, `_offset=${offset}`]
   if (near) options = [...options, `near=${encodeURIComponent(near)}`]
@@ -1102,20 +1130,22 @@ const getCodeList = async (
   noStar = true,
   signal?: AbortSignal
 ): Promise<{ code?: string; display?: string; extension?: Extension[]; codeSystem?: string }[] | undefined> => {
+  const appConfig = getConfig()
   if (!expandCode) {
     if (search !== undefined && !search.trim()) {
       return []
     }
-    let searchParam = '&only-roots=true'
+    const onlyRootSearch = (val: boolean) => (appConfig.core.fhir.valuesetExpansion ? `&only-roots=${val}` : '')
+    let searchParam = onlyRootSearch(true)
     // if search is * then we fetch the roots of the valueSet
     if (search !== '*' && search !== undefined) {
       // if noStar is true then we search for the code, else we search for the display
-      searchParam = `&only-roots=false&${
+      searchParam = `${onlyRootSearch(false)}&${
         noStar ? 'code' : `_tag=text-search-rank&_tag=${lowToleranceTag}&_text`
       }=${encodeURIComponent(search.trim())}`
     }
     // TODO test if it returns all the codes without specifying the count
-    const res = await apiFhir.get<FHIR_Bundle_Response<ValueSet>>(`/ValueSet?reference=${codeSystem}${searchParam}`, {
+    const res = await apiFhir.get<FHIR_Bundle_Response<ValueSet>>(`/ValueSet/$expand?url=${codeSystem}${searchParam}`, {
       signal: signal
     })
     const valueSetBundle = getApiResponseResourcesOrThrow(res)
@@ -1123,9 +1153,9 @@ const getCodeList = async (
       ? valueSetBundle
           .map((entry) => {
             return (
-              entry.compose?.include[0].concept?.map((code) => ({
+              entry.expansion?.contains?.map((code) => ({
                 ...code,
-                codeSystem: entry.compose?.include[0].system
+                codeSystem: entry.url
               })) || []
             ) //eslint-disable-line
           })
@@ -1182,6 +1212,7 @@ export const fetchValueSet = async (
     filterOut = (value: Hierarchy<any, any>) => value.id === 'APHP generated'
   } = options || {}
   const codeList = await getCodeList(codeSystem, code, search, noStar, signal)
+  console.log(codeList, codeSystem)
   const sortingFunc = sortingKey === 'id' ? idSort : labelSort
   const formattedCodeList =
     codeList
diff --git a/src/services/aphp/serviceCohorts.ts b/src/services/aphp/serviceCohorts.ts
index 7a4cf0381..c1ba952ab 100644
--- a/src/services/aphp/serviceCohorts.ts
+++ b/src/services/aphp/serviceCohorts.ts
@@ -15,7 +15,8 @@ import {
   CohortPMSI,
   CohortMedication,
   CohortObservation,
-  CohortQuestionnaireResponse
+  CohortQuestionnaireResponse,
+  CohortPatient
 } from 'types'
 import {
   getGenderRepartitionMapAphp,
@@ -466,6 +467,25 @@ const servicesCohorts: IServiceCohorts = {
         allPatientsResp?.data?.resourceType === 'Bundle' ? allPatientsResp.data.total ?? totalPatients : totalPatients
 
       const originalPatients = getApiResponseResources(patientsResp)
+      const relatedEncountersResponse = await fetchEncounter({
+        patient: originalPatients?.map((patient) => patient.id).reduce((acc, id) => `${acc},${id}`),
+        _elements: ['serviceProvider', 'subject'],
+        _sort: 'date',
+        size: 1000
+      })
+      const relatedEncounters = getApiResponseResources(relatedEncountersResponse)
+      originalPatients?.forEach((patient: CohortPatient) => {
+        const lastEncounter = relatedEncounters
+          ?.filter((encounter) => encounter.subject?.reference === `Patient/${patient.id}`)
+          .at(-1)
+        if (lastEncounter) {
+          patient.lastOrganization = lastEncounter.serviceProvider
+        } else {
+          patient.lastOrganization = patient.extension?.find((extension) =>
+            extension.url.includes('last-encounter')
+          )?.valueReference
+        }
+      })
 
       const agePyramidData =
         patientsResp.data.resourceType === 'Bundle'
diff --git a/src/services/aphp/servicePatients.ts b/src/services/aphp/servicePatients.ts
index 3acf28284..0dd95db2f 100644
--- a/src/services/aphp/servicePatients.ts
+++ b/src/services/aphp/servicePatients.ts
@@ -790,7 +790,7 @@ const servicesPatients: IServicePatients = {
       fetchPatient({ _id: patientId, _list: groupId ? [groupId] : [] }),
       fetchEncounter({
         patient: patientId,
-        _sort: 'period-start',
+        _sort: 'date',
         sortDirection: Direction.DESC,
         _list: groupId ? [groupId] : [],
         size: 1000
diff --git a/src/state/patient.ts b/src/state/patient.ts
index f90916ef2..020871907 100644
--- a/src/state/patient.ts
+++ b/src/state/patient.ts
@@ -53,8 +53,8 @@ import {
 import { isCustomError } from 'utils/perimeters'
 import { PMSIResourceTypes, ResourceType } from 'types/requestCriterias'
 import { mapToAttribute, mapToUrlCode } from 'mappers/pmsi'
-import { getExtension } from 'utils/fhir'
 import { getConfig } from 'config'
+import { getMainDiagnosis } from 'utils/mappers'
 
 export type Medication = {
   administration?: IPatientMedication<MedicationAdministration>
@@ -815,12 +815,8 @@ const fetchLastPmsiInfo = createAsyncThunk<FetchLastPmsiReturn, FetchLastPmsiPar
       return {
         patientInfo: {
           lastGhm: claimList ? (claimList[0] as Claim) : undefined,
-          lastProcedure: procedureList ? (procedureList[0] as Procedure) : undefined,
-          mainDiagnosis: conditionList.filter(
-            (condition) =>
-              getExtension(condition, getConfig().features.condition.extensions.orbisStatus)?.valueCodeableConcept
-                ?.coding?.[0]?.code === 'dp'
-          ) as Condition[]
+          lastProcedure: procedureList ? procedureList[0] : undefined,
+          mainDiagnosis: getMainDiagnosis(conditionList)
         },
         pmsi: {
           condition: {
diff --git a/src/types.ts b/src/types.ts
index e1354f2d2..a47e89a9d 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -18,6 +18,7 @@ import {
   Period,
   Procedure,
   QuestionnaireResponse,
+  Reference,
   Resource
 } from 'fhir/r4'
 import { AxiosResponse } from 'axios'
@@ -160,7 +161,7 @@ export type CohortEncounter = Encounter & {
 }
 
 export type CohortPatient = Patient & {
-  lastEncounter?: Encounter
+  lastOrganization?: Reference
   lastProcedure?: Procedure
   mainDiagnosis?: Condition[]
   labResults?: Observation[]
diff --git a/src/types/requestCriterias.ts b/src/types/requestCriterias.ts
index 3ba381ce5..fcffdd568 100644
--- a/src/types/requestCriterias.ts
+++ b/src/types/requestCriterias.ts
@@ -1,14 +1,7 @@
 import { ScopeElement, SimpleCodeType } from 'types'
 import { Hierarchy } from './hierarchy'
 import { DocumentAttachmentMethod, DurationRangeType, LabelObject, SearchByTypes } from './searchCriterias'
-
-export enum QuestionnaireResponseParamsKeys {
-  NAME = 'questionnaire.name',
-  DATE = 'authored',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status',
-  IPP = 'subject.identifier'
-}
+import { USE_FHIR_ENCOUNTER_CARE_SITE } from 'constants.js'
 
 export enum IppParamsKeys {
   IPP_LIST_FHIR = 'identifier.value'
@@ -38,6 +31,8 @@ export enum ResourceType {
 
 export type PMSIResourceTypes = ResourceType.CONDITION | ResourceType.PROCEDURE | ResourceType.CLAIM
 
+const ENCOUNTER_CARE_SITE = USE_FHIR_ENCOUNTER_CARE_SITE ? 'encounter-care-site' : 'service-provider'
+
 export enum PatientsParamsKeys {
   GENDERS = 'gender',
   DATE_DEIDENTIFIED = 'age-month',
@@ -47,114 +42,122 @@ export enum PatientsParamsKeys {
   DEATHDATE = 'death-date'
 }
 
-export enum EncounterParamsKeys {
-  DURATION = 'length',
-  MIN_BIRTHDATE_DAY = 'start-age-visit',
-  MIN_BIRTHDATE_MONTH = 'start-age-visit-month',
-  ENTRYMODE = 'admission-mode',
-  EXITMODE = 'discharge-disposition-mode',
-  PRISENCHARGETYPE = 'class',
-  TYPEDESEJOUR = 'stay',
-  ADMISSIONMODE = 'reason-code',
-  REASON = 'admission-destination-type',
-  DESTINATION = 'discharge-disposition',
-  PROVENANCE = 'admit-source',
-  ADMISSION = 'admission-type',
-  SERVICE_PROVIDER = 'encounter-care-site',
-  STATUS = 'status',
-  START_DATE = 'period-start',
-  END_DATE = 'period-end'
+export const EncounterParamsKeys = {
+  DURATION: 'length',
+  MIN_BIRTHDATE_DAY: 'start-age-visit',
+  MIN_BIRTHDATE_MONTH: 'start-age-visit-month',
+  ENTRYMODE: 'admission-mode',
+  EXITMODE: 'discharge-disposition-mode',
+  PRISENCHARGETYPE: 'class',
+  TYPEDESEJOUR: 'stay',
+  ADMISSIONMODE: 'reason-code',
+  REASON: 'admission-destination-type',
+  DESTINATION: 'discharge-disposition',
+  PROVENANCE: 'admit-source',
+  ADMISSION: 'admission-type',
+  SERVICE_PROVIDER: ENCOUNTER_CARE_SITE,
+  STATUS: 'status',
+  START_DATE: 'period-start',
+  END_DATE: 'period-end'
+}
+
+export const DocumentsParamsKeys = {
+  IPP: 'subject.identifier',
+  DOC_STATUSES: 'docstatus',
+  DOC_TYPES: 'type',
+  ONLY_PDF_AVAILABLE: 'onlyPdfAvailable',
+  NDA: 'encounter.identifier',
+  DATE: 'date',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status'
 }
 
-export enum DocumentsParamsKeys {
-  IPP = 'subject.identifier',
-  DOC_STATUSES = 'docstatus',
-  DOC_TYPES = 'type',
-  ONLY_PDF_AVAILABLE = 'onlyPdfAvailable',
-  NDA = 'encounter.identifier',
-  DATE = 'date',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status'
+export const ConditionParamsKeys = {
+  NDA: 'encounter.identifier',
+  CODE: 'code',
+  DIAGNOSTIC_TYPES: 'orbis-status',
+  DATE: 'recorded-date',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  SOURCE: '_source',
+  ENCOUNTER_STATUS: 'encounter.status',
+  IPP: 'subject.identifier'
 }
 
-export enum ConditionParamsKeys {
-  NDA = 'encounter.identifier',
-  CODE = 'code',
-  DIAGNOSTIC_TYPES = 'orbis-status',
-  DATE = 'recorded-date',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  SOURCE = '_source',
-  ENCOUNTER_STATUS = 'encounter.status',
-  IPP = 'subject.identifier'
+export const ProcedureParamsKeys = {
+  NDA: 'encounter.identifier',
+  CODE: 'code',
+  SOURCE: '_source',
+  DATE: 'date',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status',
+  IPP: 'subject.identifier'
 }
 
-export enum ProcedureParamsKeys {
-  NDA = 'encounter.identifier',
-  CODE = 'code',
-  SOURCE = '_source',
-  DATE = 'date',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status',
-  IPP = 'subject.identifier'
+export const ClaimParamsKeys = {
+  NDA: 'encounter.identifier',
+  CODE: 'diagnosis',
+  DATE: 'created',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status',
+  IPP: 'patient.identifier'
 }
 
-export enum ClaimParamsKeys {
-  NDA = 'encounter.identifier',
-  CODE = 'diagnosis',
-  DATE = 'created',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status',
-  IPP = 'patient.identifier'
+export const PrescriptionParamsKeys = {
+  NDA: 'encounter.identifier',
+  PRESCRIPTION_TYPES: 'category',
+  DATE: 'validity-period-start',
+  END_DATE: 'validity-period-end',
+  CODE: 'code',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status',
+  PRESCRIPTION_ROUTES: 'dosage-instruction-route'
 }
 
-export enum PrescriptionParamsKeys {
-  NDA = 'encounter.identifier',
-  PRESCRIPTION_TYPES = 'category',
-  DATE = 'validity-period-start',
-  END_DATE = 'validity-period-end',
-  CODE = 'code',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status',
-  PRESCRIPTION_ROUTES = 'dosage-instruction-route'
+export const AdministrationParamsKeys = {
+  NDA: 'context.identifier',
+  ADMINISTRATION_ROUTES: 'dosage-route',
+  DATE: 'effective-time',
+  EXECUTIVE_UNITS: `context.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'context.status'
 }
 
-export enum AdministrationParamsKeys {
-  NDA = 'context.identifier',
-  ADMINISTRATION_ROUTES = 'dosage-route',
-  DATE = 'effective-time',
-  EXECUTIVE_UNITS = 'context.encounter-care-site',
-  ENCOUNTER_STATUS = 'context.status'
+export const ObservationParamsKeys = {
+  NDA: 'encounter.identifier',
+  ANABIO_LOINC: 'code',
+  VALIDATED_STATUS: 'status',
+  DATE: 'date',
+  VALUE: 'value-quantity',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status',
+  IPP: 'subject.identifier'
 }
 
-export enum ObservationParamsKeys {
-  NDA = 'encounter.identifier',
-  ANABIO_LOINC = 'code',
-  VALIDATED_STATUS = 'status',
-  DATE = 'date',
-  VALUE = 'value-quantity',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status',
-  IPP = 'subject.identifier'
+export const ImagingParamsKeys = {
+  IPP: 'patient.identifier',
+  MODALITY: 'modality',
+  NDA: 'encounter.identifier',
+  DATE: 'started',
+  STUDY_DESCRIPTION: 'description',
+  STUDY_PROCEDURE: 'procedureCode',
+  NB_OF_SERIES: 'numberOfSeries',
+  NB_OF_INS: 'numberOfInstances',
+  WITH_DOCUMENT: 'with-document',
+  STUDY_UID: 'identifier',
+  SERIES_DATE: 'series-started',
+  SERIES_DESCRIPTION: 'series-description',
+  SERIES_PROTOCOL: 'series-protocol',
+  SERIES_MODALITIES: 'series-modality',
+  SERIES_UID: 'series',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status'
 }
 
-export enum ImagingParamsKeys {
-  IPP = 'patient.identifier',
-  MODALITY = 'modality',
-  NDA = 'encounter.identifier',
-  DATE = 'started',
-  STUDY_DESCRIPTION = 'description',
-  STUDY_PROCEDURE = 'procedureCode',
-  NB_OF_SERIES = 'numberOfSeries',
-  NB_OF_INS = 'numberOfInstances',
-  WITH_DOCUMENT = 'with-document',
-  STUDY_UID = 'identifier',
-  SERIES_DATE = 'series-started',
-  SERIES_DESCRIPTION = 'series-description',
-  SERIES_PROTOCOL = 'series-protocol',
-  SERIES_MODALITIES = 'series-modality',
-  SERIES_UID = 'series',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status'
+export const QuestionnaireResponseParamsKeys = {
+  NAME: 'questionnaire.name',
+  DATE: 'authored',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status',
+  IPP: 'subject.identifier'
 }
 
 export enum CriteriaType {
diff --git a/src/types/searchCriterias.ts b/src/types/searchCriterias.ts
index 504cd9425..98a46348d 100644
--- a/src/types/searchCriterias.ts
+++ b/src/types/searchCriterias.ts
@@ -3,6 +3,7 @@ import { PatientTableLabels } from './patient'
 import { CohortsType } from './cohorts'
 import { ResourceType } from './requestCriterias'
 import { Hierarchy } from './hierarchy'
+import { getConfig } from 'config'
 
 export enum FormNames {
   PREGNANCY = 'APHPEDSQuestionnaireFicheGrossesse',
@@ -366,11 +367,15 @@ export type ActionFilters<F> =
   | ActionRemoveSearchCriterias
   | ActionAddSearchCriterias<F>
 
-export const searchByListPatients = [
-  {
-    id: SearchByTypes.TEXT,
-    label: SearchByTypesLabelPatients.TEXT
-  },
+export const searchByListPatients = () => [
+  ...(getConfig().core.fhir.textSearch
+    ? [
+        {
+          id: SearchByTypes.TEXT,
+          label: SearchByTypesLabelPatients.TEXT
+        }
+      ]
+    : []),
   {
     id: SearchByTypes.FAMILY,
     label: SearchByTypesLabelPatients.FAMILY
diff --git a/src/utils/age.ts b/src/utils/age.ts
index 0a3d1ea1a..a8adeab8d 100644
--- a/src/utils/age.ts
+++ b/src/utils/age.ts
@@ -38,6 +38,17 @@ export const getAge = (patient: CohortPatient): string => {
   } else if (totalMonths) {
     return getAgeAphp(totalMonths.valueInteger, 'months')
   }
+  if (patient.birthDate) {
+    const birthDate = moment(patient.birthDate)
+    const endDate = patient.deceasedDateTime ? moment(patient.deceasedDateTime) : moment()
+    if (patient.deceasedBoolean && !patient.deceasedDateTime) return 'Âge inconnu'
+    const age = endDate.diff(birthDate, 'years')
+    if (age > 0) return `${age} an(s)`
+    const ageMonth = endDate.diff(birthDate, 'months')
+    if (ageMonth > 0) return `${ageMonth} mois`
+    const ageDay = endDate.diff(birthDate, 'days')
+    return `${ageDay} jour(s)`
+  }
   return 'Âge inconnu'
 }
 
diff --git a/src/utils/cohortCreation.ts b/src/utils/cohortCreation.ts
index b95549737..f42731544 100644
--- a/src/utils/cohortCreation.ts
+++ b/src/utils/cohortCreation.ts
@@ -89,6 +89,7 @@ import { Hierarchy } from 'types/hierarchy'
 import { getConfig } from 'config'
 
 const REQUETEUR_VERSION = 'v1.6.0'
+const USE_SEARCH_PARAMS_EXTENSIONS = false
 
 const DEFAULT_CRITERIA_ERROR: SelectedCriteriaType = {
   id: 0,
@@ -269,50 +270,66 @@ export const cleanNominativeCriterias = (
 
 export const buildPatientFilter = (criterion: DemographicDataType, deidentified: boolean): string[] => {
   const isDeidentified = deidentified ? PatientsParamsKeys.DATE_DEIDENTIFIED : PatientsParamsKeys.DATE_IDENTIFIED
+  const appConfig = getConfig()
   return [
-    'active=true',
+    ...(appConfig.core.fhir.filterActive ? ['active=true'] : []),
     filtersBuilders(PatientsParamsKeys.GENDERS, buildLabelObjectFilter(criterion.genders)),
     filtersBuilders(PatientsParamsKeys.VITAL_STATUS, buildLabelObjectFilter(criterion.vitalStatus)),
     filtersBuilders(PatientsParamsKeys.BIRTHDATE, buildDateFilter(criterion.birthdates[1], 'le')),
     filtersBuilders(PatientsParamsKeys.BIRTHDATE, buildDateFilter(criterion.birthdates[0], 'ge')),
     filtersBuilders(PatientsParamsKeys.DEATHDATE, buildDateFilter(criterion.deathDates[0], 'ge')),
     filtersBuilders(PatientsParamsKeys.DEATHDATE, buildDateFilter(criterion.deathDates[1], 'le')),
-    criterion.birthdates[0] === null && criterion.birthdates[1] === null
+    appConfig.core.fhir.extraSearchParams && criterion.birthdates[0] === null && criterion.birthdates[1] === null
       ? buildDurationFilter(criterion.age[0], isDeidentified, 'ge', deidentified)
       : '',
-    criterion.birthdates[0] === null && criterion.birthdates[1] === null
+    appConfig.core.fhir.extraSearchParams && criterion.birthdates[0] === null && criterion.birthdates[1] === null
       ? buildDurationFilter(criterion.age[1], isDeidentified, 'le', deidentified)
       : ''
   ]
 }
 
 export const buildEncounterFilter = (criterion: EncounterDataType, deidentified: boolean): string[] => {
+  const appConfig = getConfig()
   const isMinBirthdateDeidentified = deidentified
     ? EncounterParamsKeys.MIN_BIRTHDATE_MONTH
     : EncounterParamsKeys.MIN_BIRTHDATE_DAY
   return [
-    'subject.active=true',
+    ...(appConfig.core.fhir.filterActive ? ['subject.active=true'] : []),
     filtersBuilders(EncounterParamsKeys.ADMISSIONMODE, buildLabelObjectFilter(criterion.admissionMode)),
-    filtersBuilders(EncounterParamsKeys.ENTRYMODE, buildLabelObjectFilter(criterion.entryMode)),
-    filtersBuilders(EncounterParamsKeys.EXITMODE, buildLabelObjectFilter(criterion.exitMode)),
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(EncounterParamsKeys.ENTRYMODE, buildLabelObjectFilter(criterion.entryMode))
+      : '',
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(EncounterParamsKeys.EXITMODE, buildLabelObjectFilter(criterion.exitMode))
+      : '',
     filtersBuilders(EncounterParamsKeys.PRISENCHARGETYPE, buildLabelObjectFilter(criterion.priseEnChargeType)),
-    filtersBuilders(EncounterParamsKeys.TYPEDESEJOUR, buildLabelObjectFilter(criterion.typeDeSejour)),
-    filtersBuilders(EncounterParamsKeys.DESTINATION, buildLabelObjectFilter(criterion.destination)),
-    filtersBuilders(EncounterParamsKeys.PROVENANCE, buildLabelObjectFilter(criterion.provenance)),
-    filtersBuilders(EncounterParamsKeys.ADMISSION, buildLabelObjectFilter(criterion.admission)),
-    filtersBuilders(EncounterParamsKeys.REASON, buildLabelObjectFilter(criterion.reason)),
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(EncounterParamsKeys.TYPEDESEJOUR, buildLabelObjectFilter(criterion.typeDeSejour))
+      : '',
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(EncounterParamsKeys.DESTINATION, buildLabelObjectFilter(criterion.destination))
+      : '',
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(EncounterParamsKeys.PROVENANCE, buildLabelObjectFilter(criterion.provenance))
+      : '',
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(EncounterParamsKeys.ADMISSION, buildLabelObjectFilter(criterion.admission))
+      : '',
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(EncounterParamsKeys.REASON, buildLabelObjectFilter(criterion.reason))
+      : '',
     filtersBuilders(EncounterParamsKeys.SERVICE_PROVIDER, buildEncounterServiceFilter(criterion.encounterService)),
     filtersBuilders(EncounterParamsKeys.STATUS, buildLabelObjectFilter(criterion.encounterStatus)),
-    criterion.duration[0] !== null
+    appConfig.core.fhir.extraSearchParams && criterion.duration[0] !== null
       ? buildDurationFilter(criterion?.duration?.[0], EncounterParamsKeys.DURATION, 'ge')
       : '',
-    criterion.duration[1] !== null
+    appConfig.core.fhir.extraSearchParams && criterion.duration[1] !== null
       ? buildDurationFilter(criterion?.duration?.[1], EncounterParamsKeys.DURATION, 'le')
       : '',
-    criterion.age[0] !== null
+    appConfig.core.fhir.extraSearchParams && criterion.age[0] !== null
       ? buildDurationFilter(criterion?.age[0], isMinBirthdateDeidentified, 'ge', deidentified)
       : '',
-    criterion.age[1] !== null
+    appConfig.core.fhir.extraSearchParams && criterion.age[1] !== null
       ? buildDurationFilter(criterion?.age[1], isMinBirthdateDeidentified, 'le', deidentified)
       : '',
     buildEncounterDateFilter(
@@ -326,6 +343,7 @@ export const buildEncounterFilter = (criterion: EncounterDataType, deidentified:
 }
 
 export const buildDocumentFilter = (criterion: DocumentDataType): string[] => {
+  const appConfig = getConfig()
   const docStatusCodeSystem = getConfig().core.codeSystems.docStatus
   const joinDocStatuses = (docStatuses: string[]): string => {
     const filterDocStatuses: string[] = []
@@ -338,13 +356,16 @@ export const buildDocumentFilter = (criterion: DocumentDataType): string[] => {
   }
 
   return [
-    `type:not=doc-impor&contenttype=text/plain&subject.active=true`,
+    ...(appConfig.core.fhir.filterActive ? ['subject.active=true'] : []),
+    'type:not=doc-impor&contenttype=text/plain',
     filtersBuilders(DocumentsParamsKeys.EXECUTIVE_UNITS, buildEncounterServiceFilter(criterion.encounterService)),
     filtersBuilders(
       criterion.searchBy === SearchByTypes.TEXT ? SearchByTypes.TEXT : SearchByTypes.DESCRIPTION,
       buildSearchFilter(criterion.search)
     ),
-    filtersBuilders(DocumentsParamsKeys.DOC_STATUSES, joinDocStatuses(criterion.docStatuses)),
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(DocumentsParamsKeys.DOC_STATUSES, joinDocStatuses(criterion.docStatuses))
+      : '',
     filtersBuilders(
       DocumentsParamsKeys.DOC_TYPES,
       buildLabelObjectFilter(
@@ -369,14 +390,19 @@ export const buildDocumentFilter = (criterion: DocumentDataType): string[] => {
 }
 
 export const buildConditionFilter = (criterion: Cim10DataType): string[] => {
+  const appConfig = getConfig()
   return [
-    'subject.active=true',
+    ...(appConfig.core.fhir.filterActive ? ['subject.active=true'] : []),
     filtersBuilders(
       ConditionParamsKeys.CODE,
       buildLabelObjectFilter(criterion.code, getConfig().features.condition.valueSets.conditionHierarchy.url)
     ),
-    filtersBuilders(ConditionParamsKeys.DIAGNOSTIC_TYPES, buildLabelObjectFilter(criterion.diagnosticType)),
-    criterion.source ? buildSimpleFilter(criterion.source, ProcedureParamsKeys.SOURCE) : '',
+    ...(appConfig.core.fhir.extraSearchParams
+      ? [filtersBuilders(ConditionParamsKeys.DIAGNOSTIC_TYPES, buildLabelObjectFilter(criterion.diagnosticType))]
+      : []),
+    appConfig.core.fhir.extraSearchParams && criterion.source
+      ? buildSimpleFilter(criterion.source, ProcedureParamsKeys.SOURCE)
+      : '',
     filtersBuilders(ConditionParamsKeys.EXECUTIVE_UNITS, buildEncounterServiceFilter(criterion.encounterService)),
     filtersBuilders(ConditionParamsKeys.ENCOUNTER_STATUS, buildLabelObjectFilter(criterion.encounterStatus)),
     filtersBuilders(ConditionParamsKeys.DATE, buildDateFilter(criterion.startOccurrence[0], 'ge')),
@@ -392,8 +418,9 @@ export const buildConditionFilter = (criterion: Cim10DataType): string[] => {
 }
 
 export const buildProcedureFilter = (criterion: CcamDataType): string[] => {
+  const appConfig = getConfig()
   return [
-    'subject.active=true',
+    ...(appConfig.core.fhir.filterActive ? ['subject.active=true'] : []),
     filtersBuilders(
       ProcedureParamsKeys.CODE,
       buildLabelObjectFilter(criterion.code, getConfig().features.procedure.valueSets.procedureHierarchy.url)
@@ -402,7 +429,9 @@ export const buildProcedureFilter = (criterion: CcamDataType): string[] => {
     filtersBuilders(ProcedureParamsKeys.ENCOUNTER_STATUS, buildLabelObjectFilter(criterion.encounterStatus)),
     filtersBuilders(ProcedureParamsKeys.DATE, buildDateFilter(criterion.startOccurrence[0], 'ge')),
     filtersBuilders(ProcedureParamsKeys.DATE, buildDateFilter(criterion.startOccurrence[1], 'le')),
-    criterion.source ? buildSimpleFilter(criterion.source, ProcedureParamsKeys.SOURCE) : '',
+    appConfig.core.fhir.extraSearchParams && criterion.source
+      ? buildSimpleFilter(criterion.source, ProcedureParamsKeys.SOURCE)
+      : '',
     buildEncounterDateFilter(
       criterion.type,
       criterion.includeEncounterStartDateNull,
@@ -414,8 +443,9 @@ export const buildProcedureFilter = (criterion: CcamDataType): string[] => {
 }
 
 export const buildClaimFilter = (criterion: GhmDataType): string[] => {
+  const appConfig = getConfig()
   return [
-    'patient.active=true',
+    ...(appConfig.core.fhir.filterActive ? ['patient.active=true'] : []),
     filtersBuilders(
       ClaimParamsKeys.CODE,
       buildLabelObjectFilter(criterion.code, getConfig().features.claim.valueSets.claimHierarchy.url)
@@ -435,14 +465,17 @@ export const buildClaimFilter = (criterion: GhmDataType): string[] => {
 }
 
 export const buildMedicationFilter = (criterion: MedicationDataType): string[] => {
+  const appConfig = getConfig()
   return [
-    'subject.active=true',
-    filtersBuilders(
-      criterion.type === CriteriaType.MEDICATION_REQUEST
-        ? PrescriptionParamsKeys.PRESCRIPTION_ROUTES
-        : AdministrationParamsKeys.ADMINISTRATION_ROUTES,
-      buildLabelObjectFilter(criterion.administration)
-    ),
+    ...(appConfig.core.fhir.filterActive ? ['subject.active=true'] : []),
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(
+          criterion.type === CriteriaType.MEDICATION_REQUEST
+            ? PrescriptionParamsKeys.PRESCRIPTION_ROUTES
+            : AdministrationParamsKeys.ADMINISTRATION_ROUTES,
+          buildLabelObjectFilter(criterion.administration)
+        )
+      : '',
     filtersBuilders(
       criterion.type === CriteriaType.MEDICATION_REQUEST
         ? PrescriptionParamsKeys.EXECUTIVE_UNITS
@@ -467,8 +500,12 @@ export const buildMedicationFilter = (criterion: MedicationDataType): string[] =
       criterion.type === CriteriaType.MEDICATION_REQUEST ? PrescriptionParamsKeys.DATE : AdministrationParamsKeys.DATE,
       buildDateFilter(criterion.startOccurrence[1], 'le')
     ),
-    filtersBuilders(PrescriptionParamsKeys.END_DATE, buildDateFilter(criterion.endOccurrence?.[0], 'ge')),
-    filtersBuilders(PrescriptionParamsKeys.END_DATE, buildDateFilter(criterion.endOccurrence?.[1], 'le')),
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(PrescriptionParamsKeys.END_DATE, buildDateFilter(criterion.endOccurrence?.[0], 'ge'))
+      : '',
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(PrescriptionParamsKeys.END_DATE, buildDateFilter(criterion.endOccurrence?.[1], 'le'))
+      : '',
     criterion.type === CriteriaType.MEDICATION_REQUEST
       ? filtersBuilders(PrescriptionParamsKeys.PRESCRIPTION_TYPES, buildLabelObjectFilter(criterion.prescriptionType))
       : '',
@@ -482,9 +519,13 @@ export const buildMedicationFilter = (criterion: MedicationDataType): string[] =
   ]
 }
 
-export const buildObservationFilter = (criterion: ObservationDataType): string[] => {
+const buildObservationFilter = (criterion: ObservationDataType): string[] => {
+  const appConfig = getConfig()
   return [
-    `subject.active=true&${ObservationParamsKeys.VALIDATED_STATUS}=${BiologyStatus.VALIDATED}`,
+    ...(appConfig.core.fhir.filterActive ? ['subject.active=true'] : []),
+    ...(appConfig.features.observation.useObservationDefaultValidated
+      ? [`${ObservationParamsKeys.VALIDATED_STATUS}=${BiologyStatus.VALIDATED}`]
+      : []),
     filtersBuilders(
       ObservationParamsKeys.ANABIO_LOINC,
       buildLabelObjectFilter(criterion.code, getConfig().features.observation.valueSets.biologyHierarchyAnabio.url)
@@ -504,30 +545,51 @@ export const buildObservationFilter = (criterion: ObservationDataType): string[]
   ]
 }
 
-export const buildImagingFilter = (criterion: ImagingDataType): string[] => {
+const buildImagingFilter = (criterion: ImagingDataType): string[] => {
+  const appConfig = getConfig()
   return [
-    'patient.active=true',
+    ...(appConfig.core.fhir.filterActive ? ['patient.active=true'] : []),
     filtersBuilders(ImagingParamsKeys.DATE, buildDateFilter(criterion.studyStartDate, 'ge')),
     filtersBuilders(ImagingParamsKeys.DATE, buildDateFilter(criterion.studyEndDate, 'le')),
-    filtersBuilders(ImagingParamsKeys.SERIES_DATE, buildDateFilter(criterion.seriesStartDate, 'ge')),
-    filtersBuilders(ImagingParamsKeys.SERIES_DATE, buildDateFilter(criterion.seriesEndDate, 'le')),
-    filtersBuilders(ImagingParamsKeys.STUDY_DESCRIPTION, buildSearchFilter(criterion.studyDescription)),
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(ImagingParamsKeys.SERIES_DATE, buildDateFilter(criterion.seriesStartDate, 'ge'))
+      : '',
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(ImagingParamsKeys.SERIES_DATE, buildDateFilter(criterion.seriesEndDate, 'le'))
+      : '',
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(ImagingParamsKeys.STUDY_DESCRIPTION, buildSearchFilter(criterion.studyDescription))
+      : '',
     filtersBuilders(ImagingParamsKeys.STUDY_PROCEDURE, buildSearchFilter(criterion.studyProcedure)),
-    filtersBuilders(ImagingParamsKeys.SERIES_DESCRIPTION, buildSearchFilter(criterion.seriesDescription)),
-    filtersBuilders(ImagingParamsKeys.SERIES_PROTOCOL, buildSearchFilter(criterion.seriesProtocol)),
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(ImagingParamsKeys.SERIES_DESCRIPTION, buildSearchFilter(criterion.seriesDescription))
+      : '',
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(ImagingParamsKeys.SERIES_PROTOCOL, buildSearchFilter(criterion.seriesProtocol))
+      : '',
     filtersBuilders(ImagingParamsKeys.MODALITY, buildLabelObjectFilter(criterion.studyModalities)),
-    filtersBuilders(ImagingParamsKeys.SERIES_MODALITIES, buildLabelObjectFilter(criterion.seriesModalities)),
+    appConfig.core.fhir.extraSearchParams
+      ? filtersBuilders(ImagingParamsKeys.SERIES_MODALITIES, buildLabelObjectFilter(criterion.seriesModalities))
+      : '',
     filtersBuilders(ImagingParamsKeys.EXECUTIVE_UNITS, buildEncounterServiceFilter(criterion.encounterService)),
-    filtersBuilders(
-      ImagingParamsKeys.NB_OF_SERIES,
-      buildComparatorFilter(criterion.numberOfSeries, criterion.seriesComparator)
-    ),
-    filtersBuilders(
-      ImagingParamsKeys.NB_OF_INS,
-      buildComparatorFilter(criterion.numberOfIns, criterion.instancesComparator)
-    ),
+    ...(USE_SEARCH_PARAMS_EXTENSIONS
+      ? [
+          filtersBuilders(
+            ImagingParamsKeys.NB_OF_SERIES,
+            buildComparatorFilter(criterion.numberOfSeries, criterion.seriesComparator)
+          )
+        ]
+      : []),
+    ...(USE_SEARCH_PARAMS_EXTENSIONS
+      ? [
+          filtersBuilders(
+            ImagingParamsKeys.NB_OF_INS,
+            buildComparatorFilter(criterion.numberOfIns, criterion.instancesComparator)
+          )
+        ]
+      : []),
     filtersBuilders(ImagingParamsKeys.ENCOUNTER_STATUS, buildLabelObjectFilter(criterion.encounterStatus)),
-    buildWithDocumentFilter(criterion, ImagingParamsKeys.WITH_DOCUMENT),
+    appConfig.core.fhir.extraSearchParams ? buildWithDocumentFilter(criterion, ImagingParamsKeys.WITH_DOCUMENT) : '',
     buildSimpleFilter(
       criterion.studyUid,
       ImagingParamsKeys.STUDY_UID,
@@ -545,8 +607,9 @@ export const buildImagingFilter = (criterion: ImagingDataType): string[] => {
 }
 
 export const buildPregnancyFilter = (criterion: PregnancyDataType): string[] => {
+  const appConfig = getConfig()
   return [
-    'subject.active=true',
+    ...(appConfig.core.fhir.filterActive ? ['subject.active=true'] : []),
     `questionnaire.name=${FormNames.PREGNANCY}`,
     'status=in-progress,completed',
     filtersBuilders(
@@ -605,8 +668,9 @@ export const buildPregnancyFilter = (criterion: PregnancyDataType): string[] =>
 }
 
 export const buildHospitFilter = (criterion: HospitDataType): string[] => {
+  const appConfig = getConfig()
   return [
-    'subject.active=true',
+    ...(appConfig.core.fhir.filterActive ? ['subject.active=true'] : []),
     `questionnaire.name=${FormNames.HOSPIT}`,
     'status=in-progress,completed',
     filtersBuilders(
diff --git a/src/utils/filters.ts b/src/utils/filters.ts
index f12c027ff..f3ad0090f 100644
--- a/src/utils/filters.ts
+++ b/src/utils/filters.ts
@@ -17,6 +17,7 @@ import { getDurationRangeLabel } from './age'
 import { CohortsType, CohortsTypeLabel } from 'types/cohorts'
 import { Hierarchy } from 'types/hierarchy'
 import labels from 'labels.json'
+import { perimeterDisplay } from './perimeters'
 
 export const getCohortsTypeLabel = (type: CohortsType): string => {
   switch (type) {
@@ -130,9 +131,10 @@ export const getFilterLabel = (key: FilterKeys, value: FilterValue): string => {
     return `Source : ${value}`
   }
   if (key === FilterKeys.EXECUTIVE_UNITS) {
-    return `Unité exécutrice :  ${(value as Hierarchy<ScopeElement, string>).source_value} - ${
+    return `Unité exécutrice :  ${perimeterDisplay(
+      (value as Hierarchy<ScopeElement, string>).source_value,
       (value as Hierarchy<ScopeElement, string>).name
-    }`
+    )}`
   }
   if (key === FilterKeys.DOC_STATUSES) {
     return `Documents : ${value}`
diff --git a/src/utils/mappers.ts b/src/utils/mappers.ts
index 9dbed36be..b87867290 100644
--- a/src/utils/mappers.ts
+++ b/src/utils/mappers.ts
@@ -30,6 +30,9 @@ import { comparatorToFilter, parseOccurence } from './valueComparator'
 import services from 'services/aphp'
 import extractFilterParams, { FhirFilterValue } from './fhirFilterParser'
 import { Hierarchy } from 'types/hierarchy'
+import { CodeableConcept, Coding, Condition } from 'fhir/r4'
+import { getConfig } from 'config'
+import { getExtension } from './fhir'
 
 const searchReducer = (accumulator: string, currentValue: string): string =>
   accumulator || !!accumulator === false ? `${accumulator},${currentValue}` : currentValue || accumulator
@@ -136,7 +139,10 @@ export const buildObservationValueFilter = (criterion: ObservationDataType, fhir
       return `${fhirKey}=${valueComparatorFilter}${criterion.searchByValue[0]}`
     }
   }
-  return `${fhirKey}=le0,ge0`
+  if (getConfig().features.observation.useObservationValueRestriction) {
+    return `${fhirKey}=le0,ge0`
+  }
+  return ''
 }
 
 export const unbuildObservationValueFilter = (filters: string[][], currentCriterion: ObservationDataType) => {
@@ -382,3 +388,22 @@ export const unbuildQuestionnaireFilters = (
 export const filtersBuilders = (fhirKey: string, value?: string) => {
   return value ? `${fhirKey}=${value}` : ''
 }
+
+export const getPreferedCode = (code?: CodeableConcept): Coding | undefined => {
+  return (
+    code?.coding?.find((c) => c.userSelected === true) ||
+    (!getConfig().core.fhir.selectedCodeOnly ? code?.coding?.[0] : undefined)
+  )
+}
+
+export const getMainDiagnosis = (conditionList: Condition[]): Condition[] => {
+  const appConfig = getConfig()
+  if (appConfig.features.condition.extensions.orbisStatus) {
+    return conditionList.filter(
+      (condition) =>
+        getExtension(condition, appConfig.features.condition.extensions.orbisStatus)?.valueCodeableConcept?.coding?.[0]
+          ?.code === 'dp'
+    )
+  }
+  return conditionList
+}
diff --git a/src/utils/perimeters.ts b/src/utils/perimeters.ts
index a01724ddf..760d014c2 100644
--- a/src/utils/perimeters.ts
+++ b/src/utils/perimeters.ts
@@ -52,3 +52,7 @@ export const scopeLevelsToRequestParam = (sourceType: SourceType) => {
 export const isCustomError = <T>(response: Back_API_Response<T> | CustomError): response is CustomError => {
   return response && !!(response as CustomError).errorType
 }
+
+export const perimeterDisplay = (source_value: string | null, name: string) => {
+  return source_value ? `${source_value} - ${name}` : name
+}
diff --git a/src/utils/requestCriterias.tsx b/src/utils/requestCriterias.tsx
index 092f600ef..0efcb1752 100644
--- a/src/utils/requestCriterias.tsx
+++ b/src/utils/requestCriterias.tsx
@@ -22,6 +22,7 @@ import { CriteriaState } from 'state/criteria'
 import { Tooltip, Typography } from '@mui/material'
 import { Hierarchy } from 'types/hierarchy'
 import { ScopeElement, SimpleCodeType } from 'types'
+import { perimeterDisplay } from './perimeters'
 
 export const getOccurenceDateLabel = (
   selectedCriteriaType: Exclude<CriteriaTypesWithAdvancedInputs, CriteriaType.IMAGING>,
@@ -81,7 +82,7 @@ const getLabelFromCriteriaObject = (
 }
 
 const getLabelFromName = (values: Hierarchy<ScopeElement, string>[]) => {
-  const labels = values.map((value) => `${value.source_value} - ${value.name}`).join(' - ')
+  const labels = values.map((value) => perimeterDisplay(value.source_value, value.name)).join(' - ')
   return labels
 }
 
diff --git a/src/utils/tabsUtils.ts b/src/utils/tabsUtils.ts
index 13eb15db3..237ff18a6 100644
--- a/src/utils/tabsUtils.ts
+++ b/src/utils/tabsUtils.ts
@@ -5,7 +5,7 @@ import { MedicationLabel, ResourceType } from 'types/requestCriterias'
 
 export const getPMSITab = (tabId?: string) => {
   return (
-    PMSITabs.find((tab) => tab.id.toLocaleLowerCase() === tabId?.toLocaleLowerCase()) ?? {
+    PMSITabs().find((tab) => tab.id.toLocaleLowerCase() === tabId?.toLocaleLowerCase()) ?? {
       id: ResourceType.CONDITION,
       label: PMSILabel.DIAGNOSTIC
     }
diff --git a/src/views/Dashboard/Dashboard.tsx b/src/views/Dashboard/Dashboard.tsx
index 6d2af6f45..709390c68 100644
--- a/src/views/Dashboard/Dashboard.tsx
+++ b/src/views/Dashboard/Dashboard.tsx
@@ -44,7 +44,9 @@ const Dashboard: React.FC<{
   const [searchParams] = useSearchParams()
   const groupIds = getCleanGroupId(searchParams.get('groupId'))
 
-  const [selectedTab, setSelectedTab] = useState(tabName ?? 'preview')
+  const [selectedTab, setSelectedTab] = useState(
+    tabName || (appConfig.core.fhir.facetsExtensions ? 'preview' : 'patients')
+  )
   const [tabs, setTabs] = useState<Tabs[]>([])
 
   const open = useAppSelector((state) => state.drawer)
@@ -56,19 +58,55 @@ 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: 'Aperçu',
+            value: 'preview',
+            to: '/my-patients/preview',
+            disabled: !appConfig.core.fhir.facetsExtensions
+          },
           { label: 'Patients', value: 'patients', to: '/my-patients/patients', disabled: false },
           ...(ODD_DOCUMENT_REFERENCE
-            ? [{ label: 'Documents', value: 'documents', to: '/my-patients/documents', disabled: false }]
+            ? [
+                {
+                  label: 'Documents',
+                  value: 'documents',
+                  to: '/my-patients/documents',
+                  disabled: !appConfig.core.fhir.resourceLists
+                }
+              ]
             : []),
-          { 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 },
+          { label: 'PMSI', value: 'pmsi', to: '/my-patients/pmsi', disabled: !appConfig.core.fhir.resourceLists },
+          {
+            label: 'Médicaments',
+            value: 'medication',
+            to: '/my-patients/medication',
+            disabled: !appConfig.core.fhir.resourceLists
+          },
+          {
+            label: 'Biologie',
+            value: 'biology',
+            to: '/my-patients/biology',
+            disabled: !appConfig.core.fhir.resourceLists
+          },
           ...(ODD_IMAGING
-            ? [{ label: 'Imagerie', value: 'imaging', to: '/my-patients/imaging', disabled: false }]
+            ? [
+                {
+                  label: 'Imagerie',
+                  value: 'imaging',
+                  to: '/my-patients/imaging',
+                  disabled: !appConfig.core.fhir.resourceLists
+                }
+              ]
             : []),
           ...(ODD_QUESTIONNAIRES && !dashboard.deidentifiedBoolean
-            ? [{ label: 'Formulaires', value: 'forms', to: `/my-patients/forms`, disabled: false }]
+            ? [
+                {
+                  label: 'Formulaires',
+                  value: 'forms',
+                  to: `/my-patients/forms`,
+                  disabled: !appConfig.core.fhir.resourceLists
+                }
+              ]
             : [])
         ])
         break
@@ -79,31 +117,72 @@ const Dashboard: React.FC<{
             value: 'creation',
             to: `/cohort/new/${dashboard.requestId}/${dashboard.snapshotId}`
           },
-          { label: 'Aperçu cohorte', value: 'preview', to: `/cohort/preview?groupId=${groupIds}` },
-          { label: 'Données patient', value: 'patients', to: `/cohort/patients${location.search}` },
+          {
+            label: 'Aperçu cohorte',
+            value: 'preview',
+            to: `/cohort/preview?groupId=${groupIds}`,
+            disabled: !appConfig.core.fhir.facetsExtensions
+          },
+          { label: 'Données patient', value: 'patients', to: `/cohort/patients${location.search}`, disabled: false },
           ...(ODD_DOCUMENT_REFERENCE
             ? [
                 {
                   label: 'Documents cliniques',
                   value: 'documents',
                   to: `/cohort/documents${location.search}`,
-                  disabled: false
+                  disabled: !appConfig.core.fhir.resourceLists
+                }
+              ]
+            : []),
+          {
+            label: 'PMSI',
+            value: 'pmsi',
+            to: `/cohort/pmsi${location.search}`,
+            disabled: !appConfig.core.fhir.resourceLists
+          },
+          {
+            label: 'Médicaments',
+            value: 'medication',
+            to: `/cohort/medication${location.search}`,
+            disabled: !appConfig.core.fhir.resourceLists
+          },
+          {
+            label: 'Biologie',
+            value: 'biology',
+            to: `/cohort/biology${location.search}`,
+            disabled: !appConfig.core.fhir.resourceLists
+          },
+          ...(ODD_IMAGING
+            ? [
+                {
+                  label: 'Imagerie',
+                  value: 'imaging',
+                  to: `/cohort/imaging${location.search}`,
+                  disabled: !appConfig.core.fhir.resourceLists
                 }
               ]
             : []),
-          { 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/forms${location.search}` }]
+            ? [
+                {
+                  label: 'Formulaires',
+                  value: 'forms',
+                  to: `/cohort/forms${location.search}`,
+                  disabled: !appConfig.core.fhir.resourceLists
+                }
+              ]
             : [])
         ])
         break
       case 'new_cohort':
         setTabs([
           // { label: 'Création cohorte', value: 'creation', to: `/cohort/new`, disabled: true },
-          { label: 'Aperçu cohorte', value: 'preview', to: `/cohort/new/preview`, disabled: true },
+          {
+            label: 'Aperçu cohorte',
+            value: 'preview',
+            to: `/cohort/new/preview`,
+            disabled: !appConfig.core.fhir.facetsExtensions
+          },
           { label: 'Données patient', value: 'patients', to: `/cohort/new/patients`, disabled: true },
           ...(ODD_DOCUMENT_REFERENCE
             ? [{ label: 'Documents cliniques', value: 'documents', to: `/cohort/new/documents`, disabled: true }]
@@ -120,7 +199,12 @@ const Dashboard: React.FC<{
       case 'perimeters': {
         setTabs([
           // { label: 'Création cohorte', value: 'creation', to: `/cohort/new`, disabled: true },
-          { label: 'Aperçu', value: 'preview', to: `/perimeters/preview?groupId=${groupIds}` },
+          {
+            label: 'Aperçu',
+            value: 'preview',
+            to: `/perimeters/preview?groupId=${groupIds}`,
+            disabled: !appConfig.core.fhir.facetsExtensions
+          },
           {
             label: 'Données patient',
             value: 'patients',
@@ -132,7 +216,7 @@ const Dashboard: React.FC<{
                   label: 'Documents cliniques',
                   value: 'documents',
                   to: `/perimeters/documents${location.search}`,
-                  disabled: false
+                  disabled: !appConfig.core.fhir.resourceLists
                 }
               ]
             : []),
@@ -144,10 +228,24 @@ const Dashboard: React.FC<{
           },
           { label: 'Biologie', value: 'biology', to: `/perimeters/biology${location.search}` },
           ...(ODD_IMAGING
-            ? [{ label: 'Imagerie', value: 'imaging', to: `/perimeters/imaging${location.search}` }]
+            ? [
+                {
+                  label: 'Imagerie',
+                  value: 'imaging',
+                  to: `/perimeters/imaging${location.search}`,
+                  disabled: !appConfig.core.fhir.facetsExtensions
+                }
+              ]
             : []),
           ...(ODD_QUESTIONNAIRES && !dashboard.deidentifiedBoolean
-            ? [{ label: 'Formulaires', value: 'forms', to: `/perimeters/forms${location.search}` }]
+            ? [
+                {
+                  label: 'Formulaires',
+                  value: 'forms',
+                  to: `/perimeters/forms${location.search}`,
+                  disabled: !appConfig.core.fhir.facetsExtensions
+                }
+              ]
             : [])
         ])
         break
diff --git a/src/views/SearchPatient/SearchPatient.tsx b/src/views/SearchPatient/SearchPatient.tsx
index 15254411f..ed7f0c677 100644
--- a/src/views/SearchPatient/SearchPatient.tsx
+++ b/src/views/SearchPatient/SearchPatient.tsx
@@ -32,8 +32,9 @@ const SearchPatient: React.FC<{}> = () => {
 
   const [page, setPage] = useState(1)
 
-  const [{ orderBy, searchBy, searchInput }, { changeOrderBy, changeSearchBy, changeSearchInput }] =
-    useSearchCriterias(initPatientsSearchCriterias)
+  const [{ orderBy, searchBy, searchInput }, { changeOrderBy, changeSearchBy, changeSearchInput }] = useSearchCriterias(
+    initPatientsSearchCriterias()
+  )
 
   const controllerRef = useRef<AbortController | null>(null)
 
@@ -112,7 +113,7 @@ const SearchPatient: React.FC<{}> = () => {
                 value={searchBy || SearchByTypes.TEXT}
                 label="Rechercher dans :"
                 width={'20%'}
-                items={searchByListPatients}
+                items={searchByListPatients()}
                 onchange={(newValue) => changeSearchBy(newValue)}
               />
               <SearchInput