diff --git a/src/components/CreationCohort/DataList_Criteria.tsx b/src/components/CreationCohort/DataList_Criteria.tsx
index 01f048427..0236d4b94 100644
--- a/src/components/CreationCohort/DataList_Criteria.tsx
+++ b/src/components/CreationCohort/DataList_Criteria.tsx
@@ -16,7 +16,7 @@ import HospitForm from './DiagramView/components/LogicalOperator/components/Crit
 
 import services from 'services/aphp'
 
-import { ODD_BIOLOGY, ODD_IMAGING, ODD_MEDICATION, ODD_QUESTIONNAIRE } from '../../constants'
+import { ODD_BIOLOGY, ODD_IMAGING, ODD_MEDICATION, ODD_QUESTIONNAIRE, USE_FHIR_CLAIM } from '../../constants'
 import { CriteriaType, CriteriaTypeLabels } from 'types/requestCriterias'
 
 const criteriaList: CriteriaItemType[] = [
@@ -105,17 +105,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
-        }
-      }
+      ...(USE_FHIR_CLAIM
+        ? [
+            {
+              id: CriteriaType.CLAIM,
+              title: CriteriaTypeLabels.CLAIM,
+              color: '#0063AF',
+              fontWeight: 'normal',
+              components: GhmForm,
+              fetch: {
+                ghmData: services.cohortCreation.fetchGhmData,
+                encounterStatus: services.cohortCreation.fetchEncounterStatus
+              },
+              disabled: !USE_FHIR_CLAIM
+            }
+          ]
+        : [])
     ]
   },
   {
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 9f384db27..7322b6683 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
@@ -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 { USE_FHIR_EXTRA_SEARCH_PARAM } from 'constants.js'
 
 type Cim10FormProps = {
   isOpen: boolean
@@ -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" />}
-          />
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <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/DemographicForm/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DemographicForm/index.tsx
index a4f1690ad..4a375d553 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
@@ -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 { USE_FHIR_EXTRA_SEARCH_PARAM } from 'constants.js'
 
 enum Error {
   INCOHERENT_AGE_ERROR,
@@ -183,24 +184,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>
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <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..1f4d8601c 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
@@ -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 { USE_FHIR_EXTRA_SEARCH_PARAM } from 'constants.js'
 
 const defaultComposition: Omit<DocumentDataType, 'id'> = {
   type: CriteriaType.DOCUMENTS,
@@ -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>
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <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 3da28a04e..619572497 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,3 +1,4 @@
+/* eslint-disable max-statements */
 import React, { useEffect, useState } from 'react'
 
 import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace'
@@ -32,6 +33,7 @@ import ExecutiveUnitsFilter from 'components/Filters/ExecutiveUnitsFilter'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
 import { CriteriaLabel } from 'components/ui/CriteriaLabel'
+import { USE_FHIR_EXTRA_SEARCH_PARAM } from 'constants.js'
 
 enum Error {
   EMPTY_FORM,
@@ -250,48 +252,52 @@ const EncounterForm = ({
             />
           </BlockWrapper>
 
-          <BlockWrapper container className={classes.inputItem}>
-            <CriteriaLabel label="Durée de la prise en charge" />
-            <DurationRange
-              value={duration}
-              unit={'Durée'}
-              onChange={(value) => setDuration(value)}
-              onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
-              placeholderType="encounter"
-            />
-          </BlockWrapper>
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <BlockWrapper container className={classes.inputItem}>
+              <CriteriaLabel label="Durée de la prise en charge" />
+              <DurationRange
+                value={duration}
+                unit={'Durée'}
+                onChange={(value) => setDuration(value)}
+                onError={(isError) => setError(isError ? Error.INCOHERENT_AGE_ERROR : Error.NO_ERROR)}
+                placeholderType="encounter"
+              />
+            </BlockWrapper>
+          )}
 
-          <BlockWrapper className={classes.inputItem}>
-            <CriteriaLabel label="Date de prise en charge" />
-            <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, display: 'flex', alignItems: 'center' }}
-              component="legend"
-            >
-              Fin de prise en charge
-              <Tooltip title={'Ne concerne pas les consultations'}>
-                <InfoIcon fontSize="small" color="primary" style={{ marginLeft: 4 }} />
-              </Tooltip>
-            </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>
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <BlockWrapper className={classes.inputItem}>
+              <CriteriaLabel label="Date de prise en charge" />
+              <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, display: 'flex', alignItems: 'center' }}
+                component="legend"
+              >
+                Fin de prise en charge
+                <Tooltip title={'Ne concerne pas les consultations'}>
+                  <InfoIcon fontSize="small" color="primary" style={{ marginLeft: 4 }} />
+                </Tooltip>
+              </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}>
@@ -307,18 +313,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>
+              {USE_FHIR_EXTRA_SEARCH_PARAM && (
+                <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
@@ -344,80 +352,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" />}
-              />
+              {USE_FHIR_EXTRA_SEARCH_PARAM && (
+                <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" />}
-              />
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <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>
+          )}
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <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/ImagingForm/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/ImagingForm/index.tsx
index ab3530f41..02bac4872 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
@@ -1,3 +1,4 @@
+/* eslint-disable max-statements */
 import React, { useState } from 'react'
 import { Autocomplete, Grid, MenuItem, Select, TextField } from '@mui/material'
 import { BlockWrapper } from 'components/ui/Layout'
@@ -22,7 +23,7 @@ import useStyles from './styles'
 import { mappingCriteria } from '../DemographicForm'
 import SearchbarWithCheck from 'components/ui/Inputs/SearchbarWithCheck'
 import UidTextfield from 'components/ui/Inputs/UidTextfield'
-import { MAIL_SUPPORT } from '../../../../../../../../constants'
+import { MAIL_SUPPORT, USE_FHIR_EXTRA_SEARCH_PARAM } from '../../../../../../../../constants'
 import { SourceType } from 'types/scope'
 import { CriteriaLabel } from 'components/ui/CriteriaLabel'
 
@@ -249,14 +250,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>
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <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
@@ -267,75 +270,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>
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <BlockWrapper style={{ marginBottom: '1em' }}>
+              <OccurenceInput
+                label="Nombre de séries"
+                value={numberOfSeries}
+                comparator={seriesComparator}
+                onchange={(newOccurence, newComparator) => {
+                  setNumberOfSeries(newOccurence)
+                  setSeriesComparator(newComparator)
+                }}
+              />
+            </BlockWrapper>
+          )}
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <BlockWrapper style={{ marginBottom: '1em' }}>
+              <OccurenceInput
+                label="Nombre d'instances"
+                value={numberOfIns}
+                comparator={instancesComparator}
+                onchange={(newOccurence, newComparator) => {
+                  setNumberOfIns(newOccurence)
+                  setInstancesComparator(newComparator)
+                }}
+              />
+            </BlockWrapper>
+          )}
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <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
@@ -346,58 +353,60 @@ 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">
-            <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>
+        {USE_FHIR_EXTRA_SEARCH_PARAM && (
+          <BlockWrapper style={{ marginTop: 26 }}>
+            <Collapse title="Critères liés à une série" value={isSeriesUsed} margin="0">
+              <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..039b2968f 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
@@ -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 { USE_FHIR_EXTRA_SEARCH_PARAM } from 'constants.js'
 
 type MedicationFormProps = {
   isOpen: boolean
@@ -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" />}
-          />
+          {USE_FHIR_EXTRA_SEARCH_PARAM && (
+            <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/Dashboard/PatientList/PatientList.tsx b/src/components/Dashboard/PatientList/PatientList.tsx
index 3d289bfdd..3b694c262 100644
--- a/src/components/Dashboard/PatientList/PatientList.tsx
+++ b/src/components/Dashboard/PatientList/PatientList.tsx
@@ -48,6 +48,7 @@ import { useSavedFilters } from 'hooks/filters/useSavedFilters'
 import { ResourceType } from 'types/requestCriterias'
 import List from 'components/ui/List'
 import { useAppSelector } from 'state'
+import { USE_FHIR_EXTRA_SEARCH_PARAM, USE_FHIR_FACETS_EXTENSION } from 'constants.js'
 
 type PatientListProps = {
   total: number
@@ -165,15 +166,17 @@ const PatientList = ({ groupId, 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}
-        />
+        {USE_FHIR_FACETS_EXTENSION && (
+          <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}>
@@ -284,11 +287,13 @@ const PatientList = ({ groupId, 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}
-        />
+        {USE_FHIR_EXTRA_SEARCH_PARAM && (
+          <BirthdatesRangesFilter
+            name={FilterKeys.BIRTHDATES}
+            value={birthdatesRanges}
+            deidentified={deidentified ?? false}
+          />
+        )}
       </Modal>
       <Modal
         title="Filtres sauvegardés"
diff --git a/src/components/DataTable/DataTableMedication.tsx b/src/components/DataTable/DataTableMedication.tsx
index 82883cb36..464001c85 100644
--- a/src/components/DataTable/DataTableMedication.tsx
+++ b/src/components/DataTable/DataTableMedication.tsx
@@ -14,8 +14,13 @@ import { Column, CohortMedication } from 'types'
 
 import useStyles from './styles'
 import { MedicationAdministration, MedicationRequest } from 'fhir/r4'
-import { MEDICATION_ATC, MEDICATION_ATC_ORBIS, MEDICATION_UCD } from '../../constants'
-import { OrderBy } from 'types/searchCriterias'
+import {
+  MEDICATION_ATC,
+  MEDICATION_ATC_ORBIS,
+  MEDICATION_UCD,
+  USE_FHIR_MEDICATION_ATC_UCD_CODES
+} from '../../constants'
+import { Order, OrderBy } from 'types/searchCriterias'
 import { ResourceType } from 'types/requestCriterias'
 
 type DataTableMedicationProps = {
@@ -46,10 +51,14 @@ const DataTableMedication: React.FC<DataTableMedicationProps> = ({
     { label: `NDA${deidentified ? ' chiffré' : ''}`, code: 'encounter' },
     {
       label: selectedTab === ResourceType.MEDICATION_REQUEST ? 'Date de prescription' : "Date d'administration",
-      code: 'Period-start'
+      code: selectedTab === ResourceType.MEDICATION_REQUEST ? Order.DATE : Order.EFFECTIVE_TIME
     },
-    { label: 'Code ATC', code: 'medication-atc' },
-    { label: 'Code UCD', code: 'medication-ucd' },
+    ...(USE_FHIR_MEDICATION_ATC_UCD_CODES
+      ? [
+          { label: 'Code ATC', code: 'medication-atc' },
+          { label: 'Code UCD', code: 'medication-ucd' }
+        ]
+      : [{ label: 'Code', code: 'code' }]),
     selectedTab === ResourceType.MEDICATION_REQUEST ? { label: 'Type de prescription', code: 'category-name' } : null,
     { label: "Voie d'administration", code: 'route' },
     selectedTab === ResourceType.MEDICATION_ADMINISTRATION ? { label: 'Quantité' } : null,
@@ -116,12 +125,11 @@ const DataTableMedicationLine: React.FC<{
 
   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, MEDICATION_ATC, MEDICATION_ATC_ORBIS)
   const [codeUCD, displayUCD, isUCDStandard, codeUCDSystem] = getCodes(medication, MEDICATION_UCD, '.*-ucd')
+  const defaultCode = medication.medicationCodeableConcept?.coding?.at(0)
 
   const prescriptionType =
     medication.resourceType === 'MedicationRequest' && medication.category?.[0].coding?.[0].display
@@ -139,26 +147,38 @@ const DataTableMedicationLine: React.FC<{
     <TableRow className={classes.tableBodyRows} key={medication.id}>
       <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>
+      {USE_FHIR_MEDICATION_ATC_UCD_CODES ? (
+        <>
+          <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 74fd1c5f0..6eb11c5fd 100644
--- a/src/components/DataTable/DataTableObservation.tsx
+++ b/src/components/DataTable/DataTableObservation.tsx
@@ -8,7 +8,11 @@ import DataTable from 'components/DataTable/DataTable'
 import { Column, CohortObservation } from 'types'
 
 import useStyles from './styles'
-import { BIOLOGY_HIERARCHY_ITM_LOINC, BIOLOGY_HIERARCHY_ITM_ANABIO } from '../../constants'
+import {
+  BIOLOGY_HIERARCHY_ITM_LOINC,
+  BIOLOGY_HIERARCHY_ITM_ANABIO,
+  USE_FHIR_USER_SELECTED_CODE_ONLY
+} from '../../constants'
 import { Order, OrderBy } from 'types/searchCriterias'
 
 type DataTableObservationProps = {
@@ -89,13 +93,13 @@ const DataTableObservationLine: React.FC<{
   const nda = observation.NDA
   const date = observation.effectiveDateTime
   const libelleANABIO = observation.code?.coding?.find(
-    (code) => code.system === BIOLOGY_HIERARCHY_ITM_ANABIO && code.userSelected
+    (code) => code.system === BIOLOGY_HIERARCHY_ITM_ANABIO && (!USE_FHIR_USER_SELECTED_CODE_ONLY || code.userSelected)
   )?.display
   const codeLOINC = observation.code?.coding?.find(
-    (code) => code.system === BIOLOGY_HIERARCHY_ITM_LOINC && code.userSelected
+    (code) => code.system === BIOLOGY_HIERARCHY_ITM_LOINC && (!USE_FHIR_USER_SELECTED_CODE_ONLY || code.userSelected)
   )?.code
   const libelleLOINC = observation.code?.coding?.find(
-    (code) => code.system === BIOLOGY_HIERARCHY_ITM_LOINC && code.userSelected
+    (code) => code.system === BIOLOGY_HIERARCHY_ITM_LOINC && (!USE_FHIR_USER_SELECTED_CODE_ONLY || code.userSelected)
   )?.display
   const result =
     observation.valueQuantity?.value !== null
diff --git a/src/components/DataTable/DataTablePatient.tsx b/src/components/DataTable/DataTablePatient.tsx
index ee4a44f40..3a441c267 100644
--- a/src/components/DataTable/DataTablePatient.tsx
+++ b/src/components/DataTable/DataTablePatient.tsx
@@ -141,9 +141,7 @@ const DataTablePatientLine: React.FC<{
         )}
       </TableCellWrapper>
       <TableCellWrapper align="left">
-        {patient.extension?.find((extension) => extension.url.includes('last-encounter'))
-          ? patient.extension.find((extension) => extension.url.includes('last-encounter'))?.valueReference?.display
-          : 'Non renseigné'}
+        {patient.lastEncounter ? patient.lastEncounter.display : 'Non renseigné'}
       </TableCellWrapper>
       <TableCellWrapper>
         <StatusChip
diff --git a/src/components/DataTable/DataTablePmsi.tsx b/src/components/DataTable/DataTablePmsi.tsx
index f6fc0de3d..03d80e815 100644
--- a/src/components/DataTable/DataTablePmsi.tsx
+++ b/src/components/DataTable/DataTablePmsi.tsx
@@ -11,6 +11,7 @@ import useStyles from './styles'
 import { Claim, Condition, Procedure } from 'fhir/r4'
 import { Order, OrderBy } from 'types/searchCriterias'
 import { ResourceType } from 'types/requestCriterias'
+import { getPreferedCode } from 'utils/mappers'
 
 type DataTablePmsiProps = {
   loading: boolean
@@ -101,7 +102,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/Filters/ExecutiveUnitsFilter/index.tsx b/src/components/Filters/ExecutiveUnitsFilter/index.tsx
index 177f0a0dc..e621b4474 100644
--- a/src/components/Filters/ExecutiveUnitsFilter/index.tsx
+++ b/src/components/Filters/ExecutiveUnitsFilter/index.tsx
@@ -10,7 +10,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 = {
@@ -94,7 +94,7 @@ const ExecutiveUnitsFilter = ({
                   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/components/Patient/PatientMedication/PatientMedication.tsx b/src/components/Patient/PatientMedication/PatientMedication.tsx
index 5774a8d9f..4b146444e 100644
--- a/src/components/Patient/PatientMedication/PatientMedication.tsx
+++ b/src/components/Patient/PatientMedication/PatientMedication.tsx
@@ -109,7 +109,7 @@ const PatientMedication = ({ groupId }: PatientMedicationProps) => {
       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,
@@ -412,7 +412,10 @@ const PatientMedication = ({ groupId }: PatientMedicationProps) => {
                 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 f646dff9b..e1a1a37a9 100644
--- a/src/components/Patient/PatientPMSI/PatientPMSI.tsx
+++ b/src/components/Patient/PatientPMSI/PatientPMSI.tsx
@@ -42,6 +42,7 @@ import EncounterStatusFilter from 'components/Filters/EncounterStatusFilter'
 import { AlertWrapper } from 'components/ui/Alert'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
+import { USE_FHIR_CLAIM } from 'constants.js'
 
 export type PatientPMSIProps = {
   groupId?: string
@@ -78,14 +79,16 @@ const PatientPMSI = ({ groupId }: PatientPMSIProps) => {
   const PMSITabs: PmsiTabs = [
     { label: PMSILabel.DIAGNOSTIC, id: ResourceType.CONDITION },
     { label: PMSILabel.CCAM, id: ResourceType.PROCEDURE },
-    { label: PMSILabel.GHM, id: ResourceType.CLAIM }
+    ...(USE_FHIR_CLAIM ? ([{ label: PMSILabel.GHM, id: ResourceType.CLAIM }] as PmsiTab[]) : ([] as PmsiTab[]))
   ]
   const sourceType =
     selectedTab.id === ResourceType.CONDITION
       ? SourceType.CIM10
       : selectedTab.id === ResourceType.PROCEDURE
       ? SourceType.CCAM
-      : SourceType.GHM
+      : USE_FHIR_CLAIM
+      ? SourceType.GHM
+      : SourceType.CIM10
   const [page, setPage] = useState(1)
   const {
     allSavedFilters,
diff --git a/src/components/Patient/PatientPreview/PatientPreview.tsx b/src/components/Patient/PatientPreview/PatientPreview.tsx
index 87be50c9b..899445f45 100644
--- a/src/components/Patient/PatientPreview/PatientPreview.tsx
+++ b/src/components/Patient/PatientPreview/PatientPreview.tsx
@@ -9,6 +9,8 @@ import { getLastDiagnosisLabels } from 'utils/pmsi'
 import { CohortPatient, IPatientDetails } from 'types'
 
 import useStyles from './styles'
+import { USE_FHIR_CLAIM } from 'constants.js'
+import { getPreferedCode } from 'utils/mappers'
 
 type PatientPreviewProps = {
   patient?: IPatientDetails
@@ -53,7 +55,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'
@@ -73,7 +75,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} />
+          {USE_FHIR_CLAIM && <PatientField fieldName="Dernier GHM" fieldValue={lastGhm} />}
         </Grid>
       </Grid>
     </Grid>
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/constants.js b/src/constants.js
index 96944d7ea..672363f5f 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -32,6 +32,8 @@ export const CODE_HIERARCHY_EXTENSION_NAME =
   'https://terminology.eds.aphp.fr/fhir/profile/valueSet/extension/hierarchy-path-id'
 export const CONCEPT_MAP_HIERARCHY_EXTENSION_NAME =
   'https://terminology.eds.aphp.fr/fhir/profile/conceptMap/extension/group-source-hierarchy-path'
+export const CONDITION_ORBIS_STATUS_EXTENSION_NAME =
+  'https://terminology.eds.aphp.fr/fhir/profile/condition/extension/orbis-status'
 
 export const DOC_STATUS_CODE_SYSTEM = 'http://hl7.org/fhir/CodeSystem/composition-status'
 
@@ -258,3 +260,18 @@ export const USER_TRACKING_BLACKLIST = import.meta.env.DEV
 export const VALUE_SET_SIZE = '9999'
 
 export const EXPLORATION = 'Exploration'
+
+export const USE_FHIR_FACETS_EXTENSION = false
+export const USE_FHIR_FILTER_ACTIVE = false
+export const USE_FHIR_TOTAL_COUNT = true
+export const USE_FHIR_CLAIM = false
+export const USE_FHIR_USER_SELECTED_CODE_ONLY = false
+export const USE_FHIR_CONDITION_MAIN_DIAGNOSIS_EXTENSION = false
+export const USE_FHIR_OBSERVATION_VALUE_RESTRICTION = false
+export const USE_FHIR_OBSERVATION_VALIDATED_RESTRICTION = false
+export const USE_FHIR_EXTRA_SEARCH_PARAM = false
+export const USE_FHIR_OBSERVATION_DEFAULT_VALIDATED = false
+export const USE_FHIR_MEDICATION_ATC_UCD_CODES = false
+export const USE_FHIR_RESOURCE_LISTS = false
+export const USE_FHIR_TEXT_SEARCH = false
+export const USE_FHIR_VALUESET_EXPANSION = false
diff --git a/src/mappers/filters.ts b/src/mappers/filters.ts
index 78194c5c0..fa94afbdb 100644
--- a/src/mappers/filters.ts
+++ b/src/mappers/filters.ts
@@ -43,138 +43,143 @@ import {
   MEDICATION_ADMINISTRATIONS,
   MEDICATION_PRESCRIPTION_TYPES,
   DOC_STATUS_CODE_SYSTEM,
-  ENCOUNTER_STATUS
+  ENCOUNTER_STATUS,
+  USE_FHIR_FILTER_ACTIVE,
+  USE_FHIR_OBSERVATION_VALUE_RESTRICTION,
+  USE_FHIR_EXTRA_SEARCH_PARAM
 } from '../constants'
 import services from 'services/aphp'
 import servicesPerimeters from 'services/aphp/servicePerimeters'
 import { Hierarchy } from 'types/hierarchy'
 
-export enum PatientsParamsKeys {
-  GENDERS = 'gender',
-  DATE_DEIDENTIFIED = 'age-month',
-  DATE_IDENTIFIED = 'age-day',
-  VITAL_STATUS = 'deceased',
-  BIRTHDATE = 'birthdate',
-  DEATHDATE = 'death-date'
-}
-
-export enum EncounterParamsKeys {
-  DURATION = 'length',
-  MIN_BIRTHDATE_DAY = 'start-age-visit',
-  MAX_BIRTHDATE_DAY = 'end-age-visit',
-  MIN_BIRTHDATE_MONTH = 'start-age-visit-month',
-  MAX_BIRTHDATE_MONTH = 'end-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 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 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'
-}
-
-export enum ProcedureParamsKeys {
-  NDA = 'encounter.identifier',
-  CODE = 'code',
-  SOURCE = 'source',
-  DATE = 'date',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status'
-}
-
-export enum ClaimParamsKeys {
-  NDA = 'encounter.identifier',
-  CODE = 'diagnosis',
-  DATE = 'created',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status'
-}
-
-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 enum AdministrationParamsKeys {
-  NDA = 'context.identifier',
-  ADMINISTRATION_ROUTES = 'dosage-route',
-  DATE = 'effective-time',
-  EXECUTIVE_UNITS = 'context.encounter-care-site',
-  ENCOUNTER_STATUS = 'context.status'
-}
-
-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'
-}
-
-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 enum QuestionnaireResponseParamsKeys {
-  NAME = 'questionnaire.name',
-  DATE = 'authored',
-  EXECUTIVE_UNITS = 'encounter.encounter-care-site',
-  ENCOUNTER_STATUS = 'encounter.status'
-}
-
-export enum IppParamsKeys {
-  IPP_LIST_FHIR = 'identifier.value'
+const ENCOUNTER_CARE_SITE = USE_FHIR_EXTRA_SEARCH_PARAM ? 'encounter-care-site' : 'service-provider'
+
+export const PatientsParamsKeys = {
+  GENDERS: 'gender',
+  DATE_DEIDENTIFIED: 'age-month',
+  DATE_IDENTIFIED: 'age-day',
+  VITAL_STATUS: 'deceased',
+  BIRTHDATE: 'birthdate',
+  DEATHDATE: 'death-date'
+}
+
+export const EncounterParamsKeys = {
+  DURATION: 'length',
+  MIN_BIRTHDATE_DAY: 'start-age-visit',
+  MAX_BIRTHDATE_DAY: 'end-age-visit',
+  MIN_BIRTHDATE_MONTH: 'start-age-visit-month',
+  MAX_BIRTHDATE_MONTH: 'end-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 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'
+}
+
+export const ProcedureParamsKeys = {
+  NDA: 'encounter.identifier',
+  CODE: 'code',
+  SOURCE: 'source',
+  DATE: 'date',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status'
+}
+
+export const ClaimParamsKeys = {
+  NDA: 'encounter.identifier',
+  CODE: 'diagnosis',
+  DATE: 'created',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status'
+}
+
+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 const 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'
+}
+
+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 const QuestionnaireResponseParamsKeys = {
+  NAME: 'questionnaire.name',
+  DATE: 'authored',
+  EXECUTIVE_UNITS: `encounter.${ENCOUNTER_CARE_SITE}`,
+  ENCOUNTER_STATUS: 'encounter.status'
+}
+
+export const IppParamsKeys = {
+  IPP_LIST_FHIR: 'identifier.value'
 }
 
 const getGenericKeyFromResourceType = (
@@ -597,7 +602,9 @@ 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 requestParams: string[] = []
+  if (USE_FHIR_FILTER_ACTIVE) requestParams.push('subject.active=true')
+  if (USE_FHIR_OBSERVATION_VALUE_RESTRICTION) requestParams.push('value-quantity=ge0,le0')
   if ((anabio && anabio.length > 0) || (loinc && loinc.length > 0)) {
     const key = `${ObservationParamsKeys.ANABIO_LOINC}=`
     let _anabio = ''
@@ -704,9 +711,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:
@@ -766,7 +777,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 6cd9a0327..029237ffc 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 { USE_FHIR_OBSERVATION_DEFAULT_VALIDATED, USE_FHIR_TEXT_SEARCH } from 'constants.js'
+import { ResourceType } from 'types/requestCriterias'
 
 export const initCohortsSearchCriterias: SearchCriterias<CohortsFilters> = {
   orderBy: {
@@ -53,7 +55,7 @@ export const initPatientsSearchCriterias: SearchCriterias<PatientsFilters> = {
     orderDirection: Direction.ASC
   },
   searchInput: '',
-  searchBy: SearchByTypes.TEXT,
+  searchBy: USE_FHIR_TEXT_SEARCH ? SearchByTypes.TEXT : SearchByTypes.FAMILY,
   filters: {
     genders: [],
     birthdatesRanges: [null, null],
@@ -80,9 +82,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: '',
@@ -96,7 +100,7 @@ export const initMedSearchCriterias: SearchCriterias<MedicationFilters> = {
     prescriptionTypes: [],
     encounterStatus: []
   }
-}
+})
 
 export const initBioSearchCriterias: SearchCriterias<BiologyFilters> = {
   orderBy: {
@@ -106,7 +110,7 @@ export const initBioSearchCriterias: SearchCriterias<BiologyFilters> = {
   searchInput: '',
   searchBy: SearchByTypes.TEXT,
   filters: {
-    validatedStatus: true,
+    validatedStatus: USE_FHIR_OBSERVATION_DEFAULT_VALIDATED,
     nda: '',
     loinc: [],
     anabio: [],
diff --git a/src/services/aphp/callApi.ts b/src/services/aphp/callApi.ts
index d00d1f545..dbc6a9ace 100644
--- a/src/services/aphp/callApi.ts
+++ b/src/services/aphp/callApi.ts
@@ -20,6 +20,7 @@ import apiBackend from '../apiBackend'
 import {
   Binary,
   Claim,
+  CodeSystem,
   Condition,
   DocumentReference,
   Encounter,
@@ -47,7 +48,13 @@ import {
   IMAGING_MODALITIES,
   MEDICATION_ADMINISTRATIONS,
   MEDICATION_PRESCRIPTION_TYPES,
-  DOC_STATUS_CODE_SYSTEM
+  DOC_STATUS_CODE_SYSTEM,
+  USE_FHIR_FILTER_ACTIVE,
+  USE_FHIR_FACETS_EXTENSION,
+  USE_FHIR_TOTAL_COUNT,
+  USE_FHIR_OBSERVATION_VALUE_RESTRICTION,
+  USE_FHIR_EXTRA_SEARCH_PARAM,
+  USE_FHIR_VALUESET_EXPANSION
 } from '../../constants'
 import { Direction, Order, SavedFilter, SavedFiltersResults, SearchByTypes } from 'types/searchCriterias'
 import {
@@ -65,6 +72,7 @@ import {
 } from '../../mappers/filters'
 import { ResourceType } from 'types/requestCriterias'
 import { Hierarchy } from 'types/hierarchy'
+import patient from 'state/patient'
 
 const paramValuesReducer = (accumulator: string, currentValue: string): string =>
   accumulator ? `${accumulator},${currentValue}` : currentValue ? currentValue : accumulator
@@ -122,7 +130,8 @@ export const fetchPatient = async (args: fetchPatientProps): FHIR_Bundle_Promise
   _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[] = USE_FHIR_FILTER_ACTIVE ? ['active=true'] : []
+  if (USE_FHIR_TOTAL_COUNT) 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 +150,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 (USE_FHIR_FACETS_EXTENSION && pivotFacet && pivotFacet.length > 0)
     options = [...options, `pivot-facet=${pivotFacet.reduce(paramValuesReducer, '')}`]
   if (_elements && _elements.length > 0) options = [...options, `_elements=${_elements.reduce(paramValuesReducer, '')}`]
 
@@ -183,17 +192,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[] = USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []
+  if (USE_FHIR_TOTAL_COUNT) 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 (USE_FHIR_FACETS_EXTENSION && 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)}`, {
@@ -286,13 +297,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 (USE_FHIR_TOTAL_COUNT) options = [...options, '_total=accurate']
+  if (USE_FHIR_FILTER_ACTIVE) 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)}`]
@@ -324,9 +336,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 (USE_FHIR_FACETS_EXTENSION && facet && facet.length > 0)
+    options = [...options, `facet=${facet.reduce(paramValuesReducer, '')}`]
+  if (USE_FHIR_FACETS_EXTENSION && uniqueFacet && uniqueFacet.length > 0)
     options = [...options, `unique-facet=${uniqueFacet.reduce(paramValuesReducer, '')}`]
   if (_elements && _elements.length > 0) options = [...options, `_elements=${_elements.reduce(paramValuesReducer, '')}`]
 
@@ -482,19 +495,20 @@ export const fetchProcedure = async (args: fetchProcedureProps): FHIR_Bundle_Pro
   _list = _list ? _list.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[] = USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []
+  if (USE_FHIR_TOTAL_COUNT) 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 (USE_FHIR_EXTRA_SEARCH_PARAM && source) options = [...options, `${ProcedureParamsKeys.SOURCE}=${source}`]
   if (_text) options = [...options, `_text=${encodeURIComponent(_text)}&_tag=${lowToleranceTag}`]
   if (status) options = [...options, `status=${encodeURIComponent(`${DOC_STATUS_CODE_SYSTEM}|${status}`)}`]
   if (encounterIdentifier) options = [...options, `${ProcedureParamsKeys.NDA}=${encounterIdentifier}`]
   if (minDate) options = [...options, `date=ge${minDate}`]
   if (maxDate) options = [...options, `date=le${maxDate}`]
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
+  if (!subject && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`]
   if (executiveUnits && executiveUnits.length > 0)
     options = [...options, `${ProcedureParamsKeys.EXECUTIVE_UNITS}=${executiveUnits}`]
   if (encounterStatus && encounterStatus.length > 0)
@@ -550,10 +564,11 @@ export const fetchClaim = async (args: fetchClaimProps): FHIR_Bundle_Promise_Res
   _list = _list ? _list.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[] = USE_FHIR_FILTER_ACTIVE ? ['patient.active=true'] : []
+  if (USE_FHIR_TOTAL_COUNT) 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
@@ -569,7 +584,7 @@ export const fetchClaim = async (args: fetchClaimProps): FHIR_Bundle_Promise_Res
     options = [...options, `${ClaimParamsKeys.EXECUTIVE_UNITS}=${executiveUnits}`]
   if (encounterStatus && encounterStatus.length > 0) options = [...options, `encounter.status=${encounterStatus}`]
 
-  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
@@ -613,13 +628,14 @@ export const fetchCondition = async (args: fetchConditionProps): FHIR_Bundle_Pro
   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[] = USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []
+  if (USE_FHIR_TOTAL_COUNT) 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 (USE_FHIR_EXTRA_SEARCH_PARAM && 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 (minRecordedDate) options = [...options, `${ConditionParamsKeys.DATE}=ge${minRecordedDate}`] // eslint-disable-line
@@ -629,8 +645,8 @@ export const fetchCondition = async (args: fetchConditionProps): FHIR_Bundle_Pro
   if (encounterStatus && encounterStatus.length > 0)
     options = [...options, `${ConditionParamsKeys.ENCOUNTER_STATUS}=${encounterStatus}`]
 
-  if (_list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`] // eslint-disable-line
-  if (type && type.length > 0) {
+  if (!subject && _list && _list.length > 0) options = [...options, `_list=${_list.reduce(paramValuesReducer)}`] // eslint-disable-line
+  if (USE_FHIR_EXTRA_SEARCH_PARAM && type && type.length > 0) {
     const diagnosticTypesUrl = `${CONDITION_STATUS}|`
     const urlString = type.map((id) => diagnosticTypesUrl + id).join(',')
     options = [...options, `orbis-status=${encodeURIComponent(urlString)}`]
@@ -687,11 +703,14 @@ export const fetchObservation = async (args: fetchObservationProps): FHIR_Bundle
   _list = _list ? _list.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[] = ['value-quantity=ge0,le0', 'subject.active=true']
+  let options: string[] = []
+  if (USE_FHIR_OBSERVATION_VALUE_RESTRICTION) options = [...options, 'value-quantity=ge0,le0']
+  if (USE_FHIR_FILTER_ACTIVE) options = [...options, 'subject.active=true']
+  if (USE_FHIR_TOTAL_COUNT) 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)
@@ -702,13 +721,13 @@ 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 (USE_FHIR_EXTRA_SEARCH_PARAM && rowStatus) options = [...options, `${ObservationParamsKeys.VALIDATED_STATUS}=${BiologyStatus.VALIDATED}`] // eslint-disable-line
   if (executiveUnits && executiveUnits.length > 0)
     options = [...options, `encounter.encounter-care-site=${executiveUnits}`]
   if (encounterStatus && encounterStatus.length > 0)
     options = [...options, `${ObservationParamsKeys.ENCOUNTER_STATUS}=${encounterStatus}`]
 
-  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)}`,
@@ -762,11 +781,12 @@ export const fetchMedicationRequest = async (
   _list = _list ? _list.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[] = USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []
+  if (USE_FHIR_TOTAL_COUNT) 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}`]
@@ -782,7 +802,7 @@ export const fetchMedicationRequest = async (
   if (encounterStatus && encounterStatus.length > 0)
     options = [...options, `${PrescriptionParamsKeys.ENCOUNTER_STATUS}=${encounterStatus}`]
 
-  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)}`,
@@ -836,11 +856,12 @@ export const fetchMedicationAdministration = async (
   _list = _list ? _list.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[] = USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []
+  if (USE_FHIR_TOTAL_COUNT) 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}`]
@@ -856,7 +877,7 @@ export const fetchMedicationAdministration = async (
   if (encounterStatus && encounterStatus.length > 0)
     options = [...options, `${AdministrationParamsKeys.ENCOUNTER_STATUS}=${encounterStatus}`]
 
-  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)}`,
@@ -907,7 +928,8 @@ export const fetchImaging = async (args: fetchImagingProps): FHIR_Bundle_Promise
   _list = _list ? _list.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[] = USE_FHIR_FILTER_ACTIVE ? ['patient.active=true'] : []
+  if (USE_FHIR_TOTAL_COUNT) options = [...options, '_total=accurate']
   if (patient) options = [...options, `patient=${patient}`]
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset) options = [...options, `_offset=${offset}`]
@@ -926,7 +948,7 @@ export const fetchImaging = async (args: fetchImagingProps): FHIR_Bundle_Promise
     options = [...options, `${ImagingParamsKeys.EXECUTIVE_UNITS}=${executiveUnits}`]
   if (encounterStatus && encounterStatus.length > 0)
     options = [...options, `${ImagingParamsKeys.ENCOUNTER_STATUS}=${encounterStatus}`]
-  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<ImagingStudy>>(
     `/ImagingStudy?${options.reduce(paramsReducer)}`,
@@ -951,9 +973,10 @@ type fetchFormsProps = {
 export const fetchForms = async (args: fetchFormsProps) => {
   const { patient, formName, _list, startDate, endDate, executiveUnits, encounterStatus, size } = args
   let options: string[] = ['status=in-progress,completed']
+  if (USE_FHIR_TOTAL_COUNT) 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)
@@ -1001,6 +1024,7 @@ export const fetchLocation = async (args: fetchLocationProps) => {
   const { _list, _elements, near, size, offset, signal } = args
 
   let options: string[] = []
+  if (USE_FHIR_TOTAL_COUNT) options = [...options, '_total=accurate']
   if (size !== undefined) options = [...options, `_count=${size}`]
   if (offset) options = [...options, `_offset=${offset}`]
   if (near) options = [...options, `near=${encodeURIComponent(near)}`]
@@ -1038,16 +1062,17 @@ const getCodeList = async (
     if (search !== undefined && !search.trim()) {
       return []
     }
-    let searchParam = '&only-roots=true'
+    const onlyRootSearch = (val: boolean) => (USE_FHIR_VALUESET_EXPANSION ? `&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)
@@ -1055,9 +1080,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
           })
@@ -1114,6 +1139,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 c091d416a..e0bac653b 100644
--- a/src/services/aphp/serviceCohorts.ts
+++ b/src/services/aphp/serviceCohorts.ts
@@ -11,7 +11,8 @@ import {
   CohortImaging,
   CohortComposition,
   Export,
-  ExportCSVTable
+  ExportCSVTable,
+  CohortPatient
 } from 'types'
 import {
   getGenderRepartitionMapAphp,
@@ -369,6 +370,25 @@ const servicesCohorts: IServiceCohorts = {
       const totalPatients = patientsResp.data.resourceType === 'Bundle' ? patientsResp.data.total : 0
 
       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.lastEncounter = lastEncounter.serviceProvider
+        } else {
+          patient.lastEncounter = 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 6ec9e938f..d127ffae0 100644
--- a/src/services/aphp/servicePatients.ts
+++ b/src/services/aphp/servicePatients.ts
@@ -800,7 +800,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 48afde317..aaa39dcac 100644
--- a/src/state/patient.ts
+++ b/src/state/patient.ts
@@ -60,6 +60,7 @@ import {
   CONDITION_HIERARCHY,
   PROCEDURE_HIERARCHY
 } from '../constants'
+import { getMainDiagnosis } from 'utils/mappers'
 
 export type Medication = {
   administration?: IPatientMedication<MedicationAdministration>
@@ -820,10 +821,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) => condition.extension?.[0]?.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 638084f2a..f99a5df89 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'
@@ -143,7 +144,7 @@ export type CohortEncounter = Encounter & {
 }
 
 export type CohortPatient = Patient & {
-  lastEncounter?: Encounter
+  lastEncounter?: Reference
   lastProcedure?: Procedure
   mainDiagnosis?: Condition[]
   labResults?: Observation[]
diff --git a/src/types/searchCriterias.ts b/src/types/searchCriterias.ts
index c5d4c3168..bcd2769b1 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 { USE_FHIR_TEXT_SEARCH } from 'constants.js'
 
 export enum FormNames {
   PREGNANCY = 'APHPEDSQuestionnaireFicheGrossesse',
@@ -76,7 +77,7 @@ export enum Order {
   RECORDED_DATE = 'recorded-date',
   FAMILY = 'family',
   DATE = 'date',
-  PERIOD_START = 'Period-start',
+  EFFECTIVE_TIME = 'effective-time',
   CREATED = 'created',
   DIAGNOSIS = 'diagnosis',
   ANABIO = 'code-anabio',
@@ -311,10 +312,14 @@ export type ActionFilters<F> =
   | ActionAddSearchCriterias<F>
 
 export const searchByListPatients = [
-  {
-    id: SearchByTypes.TEXT,
-    label: SearchByTypesLabelPatients.TEXT
-  },
+  ...(USE_FHIR_TEXT_SEARCH
+    ? [
+        {
+          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 0506c871e..345ce8a42 100644
--- a/src/utils/age.ts
+++ b/src/utils/age.ts
@@ -37,6 +37,17 @@ export const getAge = (patient: CohortPatient): string => {
       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 37e244b27..cd61ee8a6 100644
--- a/src/utils/cohortCreation.ts
+++ b/src/utils/cohortCreation.ts
@@ -17,7 +17,10 @@ import {
   MEDICATION_ATC,
   IMAGING_STUDY_UID_URL,
   PROCEDURE_HIERARCHY,
-  DOC_STATUS_CODE_SYSTEM
+  DOC_STATUS_CODE_SYSTEM,
+  USE_FHIR_FILTER_ACTIVE,
+  USE_FHIR_OBSERVATION_VALIDATED_RESTRICTION,
+  USE_FHIR_EXTRA_SEARCH_PARAM
 } from '../constants'
 import {
   DocumentAttachmentMethod,
@@ -99,6 +102,7 @@ import {
 } from 'mappers/filters'
 
 const REQUETEUR_VERSION = 'v1.4.5'
+const USE_SEARCH_PARAMS_EXTENSIONS = false
 
 export const STRUCTURE_HOSPITALIERE_DE_PRIS_EN_CHARGE = 'Structure hospitalière de prise en charge'
 
@@ -282,17 +286,17 @@ export const cleanNominativeCriterias = (
 const buildPatientFilter = (criterion: DemographicDataType, deidentified: boolean): string[] => {
   const isDeidentified = deidentified ? PatientsParamsKeys.DATE_DEIDENTIFIED : PatientsParamsKeys.DATE_IDENTIFIED
   return [
-    'active=true',
+    ...(USE_FHIR_FILTER_ACTIVE ? ['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
+    USE_FHIR_EXTRA_SEARCH_PARAM && criterion.birthdates[0] === null && criterion.birthdates[1] === null
       ? buildDurationFilter(criterion.age[0], isDeidentified, 'ge', deidentified)
       : '',
-    criterion.birthdates[0] === null && criterion.birthdates[1] === null
+    USE_FHIR_EXTRA_SEARCH_PARAM && criterion.birthdates[0] === null && criterion.birthdates[1] === null
       ? buildDurationFilter(criterion.age[1], isDeidentified, 'le', deidentified)
       : ''
   ]
@@ -306,28 +310,42 @@ const buildEncounterFilter = (criterion: EncounterDataType, deidentified: boolea
     ? EncounterParamsKeys.MAX_BIRTHDATE_MONTH
     : EncounterParamsKeys.MAX_BIRTHDATE_DAY
   return [
-    'subject.active=true',
+    ...(USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []),
     filtersBuilders(EncounterParamsKeys.ADMISSIONMODE, buildLabelObjectFilter(criterion.admissionMode)),
-    filtersBuilders(EncounterParamsKeys.ENTRYMODE, buildLabelObjectFilter(criterion.entryMode)),
-    filtersBuilders(EncounterParamsKeys.EXITMODE, buildLabelObjectFilter(criterion.exitMode)),
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(EncounterParamsKeys.ENTRYMODE, buildLabelObjectFilter(criterion.entryMode))
+      : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? 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)),
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(EncounterParamsKeys.TYPEDESEJOUR, buildLabelObjectFilter(criterion.typeDeSejour))
+      : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(EncounterParamsKeys.DESTINATION, buildLabelObjectFilter(criterion.destination))
+      : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(EncounterParamsKeys.PROVENANCE, buildLabelObjectFilter(criterion.provenance))
+      : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(EncounterParamsKeys.ADMISSION, buildLabelObjectFilter(criterion.admission))
+      : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(EncounterParamsKeys.REASON, buildLabelObjectFilter(criterion.reason))
+      : '',
     filtersBuilders(EncounterParamsKeys.SERVICE_PROVIDER, buildEncounterServiceFilter(criterion.encounterService)),
     filtersBuilders(EncounterParamsKeys.STATUS, buildLabelObjectFilter(criterion.encounterStatus)),
-    criterion.duration[0] !== null
+    USE_FHIR_EXTRA_SEARCH_PARAM && criterion.duration[0] !== null
       ? buildDurationFilter(criterion?.duration?.[0], EncounterParamsKeys.DURATION, 'ge')
       : '',
-    criterion.duration[1] !== null
+    USE_FHIR_EXTRA_SEARCH_PARAM && criterion.duration[1] !== null
       ? buildDurationFilter(criterion?.duration?.[1], EncounterParamsKeys.DURATION, 'le')
       : '',
-    criterion.age[0] !== null
+    USE_FHIR_EXTRA_SEARCH_PARAM && criterion.age[0] !== null
       ? buildDurationFilter(criterion?.age[0], isMinBirthdateDeidentified, 'ge', deidentified)
       : '',
-    criterion.age[1] !== null
+    USE_FHIR_EXTRA_SEARCH_PARAM && criterion.age[1] !== null
       ? buildDurationFilter(criterion?.age[1], isMaxBirthdateDeidentified, 'le', deidentified)
       : '',
     buildEncounterDateFilter(
@@ -352,13 +370,16 @@ const buildDocumentFilter = (criterion: DocumentDataType): string[] => {
   }
 
   return [
-    `type:not=doc-impor&contenttype=text/plain&subject.active=true`,
+    ...(USE_FHIR_FILTER_ACTIVE ? ['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)),
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(DocumentsParamsKeys.DOC_STATUSES, joinDocStatuses(criterion.docStatuses))
+      : '',
     filtersBuilders(
       DocumentsParamsKeys.DOC_TYPES,
       buildLabelObjectFilter(
@@ -384,10 +405,14 @@ const buildDocumentFilter = (criterion: DocumentDataType): string[] => {
 
 const buildConditionFilter = (criterion: Cim10DataType): string[] => {
   return [
-    'subject.active=true',
+    ...(USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []),
     filtersBuilders(ConditionParamsKeys.CODE, buildLabelObjectFilter(criterion.code, CONDITION_HIERARCHY)),
-    filtersBuilders(ConditionParamsKeys.DIAGNOSTIC_TYPES, buildLabelObjectFilter(criterion.diagnosticType)),
-    criterion.source ? buildSimpleFilter(criterion.source, ProcedureParamsKeys.SOURCE) : '',
+    ...(USE_FHIR_EXTRA_SEARCH_PARAM
+      ? [filtersBuilders(ConditionParamsKeys.DIAGNOSTIC_TYPES, buildLabelObjectFilter(criterion.diagnosticType))]
+      : []),
+    USE_FHIR_EXTRA_SEARCH_PARAM && 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')),
@@ -404,13 +429,15 @@ const buildConditionFilter = (criterion: Cim10DataType): string[] => {
 
 const buildProcedureFilter = (criterion: CcamDataType): string[] => {
   return [
-    'subject.active=true',
+    ...(USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []),
     filtersBuilders(ProcedureParamsKeys.CODE, buildLabelObjectFilter(criterion.code, PROCEDURE_HIERARCHY)),
     filtersBuilders(ProcedureParamsKeys.EXECUTIVE_UNITS, buildEncounterServiceFilter(criterion.encounterService)),
     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) : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM && criterion.source
+      ? buildSimpleFilter(criterion.source, ProcedureParamsKeys.SOURCE)
+      : '',
     buildEncounterDateFilter(
       criterion.type,
       criterion.includeEncounterStartDateNull,
@@ -423,7 +450,7 @@ const buildProcedureFilter = (criterion: CcamDataType): string[] => {
 
 const buildClaimFilter = (criterion: GhmDataType): string[] => {
   return [
-    'patient.active=true',
+    ...(USE_FHIR_FILTER_ACTIVE ? ['patient.active=true'] : []),
     filtersBuilders(ClaimParamsKeys.CODE, buildLabelObjectFilter(criterion.code, CLAIM_HIERARCHY)),
     filtersBuilders(ClaimParamsKeys.EXECUTIVE_UNITS, buildEncounterServiceFilter(criterion.encounterService)),
     filtersBuilders(ClaimParamsKeys.ENCOUNTER_STATUS, buildLabelObjectFilter(criterion.encounterStatus)),
@@ -441,13 +468,15 @@ const buildClaimFilter = (criterion: GhmDataType): string[] => {
 
 const buildMedicationFilter = (criterion: MedicationDataType): string[] => {
   return [
-    'subject.active=true',
-    filtersBuilders(
-      criterion.type === CriteriaType.MEDICATION_REQUEST
-        ? PrescriptionParamsKeys.PRESCRIPTION_ROUTES
-        : AdministrationParamsKeys.ADMINISTRATION_ROUTES,
-      buildLabelObjectFilter(criterion.administration)
-    ),
+    ...(USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []),
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(
+          criterion.type === CriteriaType.MEDICATION_REQUEST
+            ? PrescriptionParamsKeys.PRESCRIPTION_ROUTES
+            : AdministrationParamsKeys.ADMINISTRATION_ROUTES,
+          buildLabelObjectFilter(criterion.administration)
+        )
+      : '',
     filtersBuilders(
       criterion.type === CriteriaType.MEDICATION_REQUEST
         ? PrescriptionParamsKeys.EXECUTIVE_UNITS
@@ -469,8 +498,12 @@ 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')),
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(PrescriptionParamsKeys.END_DATE, buildDateFilter(criterion.endOccurrence?.[0], 'ge'))
+      : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(PrescriptionParamsKeys.END_DATE, buildDateFilter(criterion.endOccurrence?.[1], 'le'))
+      : '',
     criterion.type === CriteriaType.MEDICATION_REQUEST
       ? filtersBuilders(PrescriptionParamsKeys.PRESCRIPTION_TYPES, buildLabelObjectFilter(criterion.prescriptionType))
       : '',
@@ -486,7 +519,10 @@ const buildMedicationFilter = (criterion: MedicationDataType): string[] => {
 
 const buildObservationFilter = (criterion: ObservationDataType): string[] => {
   return [
-    `subject.active=true&${ObservationParamsKeys.VALIDATED_STATUS}=${BiologyStatus.VALIDATED}`,
+    ...(USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []),
+    ...(USE_FHIR_OBSERVATION_VALIDATED_RESTRICTION
+      ? [`${ObservationParamsKeys.VALIDATED_STATUS}=${BiologyStatus.VALIDATED}`]
+      : []),
     filtersBuilders(
       ObservationParamsKeys.ANABIO_LOINC,
       buildLabelObjectFilter(criterion.code, BIOLOGY_HIERARCHY_ITM_ANABIO)
@@ -508,28 +544,48 @@ const buildObservationFilter = (criterion: ObservationDataType): string[] => {
 
 const buildImagingFilter = (criterion: ImagingDataType): string[] => {
   return [
-    'patient.active=true',
+    ...(USE_FHIR_FILTER_ACTIVE ? ['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)),
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(ImagingParamsKeys.SERIES_DATE, buildDateFilter(criterion.seriesStartDate, 'ge'))
+      : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(ImagingParamsKeys.SERIES_DATE, buildDateFilter(criterion.seriesEndDate, 'le'))
+      : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? 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)),
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(ImagingParamsKeys.SERIES_DESCRIPTION, buildSearchFilter(criterion.seriesDescription))
+      : '',
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? filtersBuilders(ImagingParamsKeys.SERIES_PROTOCOL, buildSearchFilter(criterion.seriesProtocol))
+      : '',
     filtersBuilders(ImagingParamsKeys.MODALITY, buildLabelObjectFilter(criterion.studyModalities)),
-    filtersBuilders(ImagingParamsKeys.SERIES_MODALITIES, buildLabelObjectFilter(criterion.seriesModalities)),
+    USE_FHIR_EXTRA_SEARCH_PARAM
+      ? 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),
+    USE_FHIR_EXTRA_SEARCH_PARAM ? buildWithDocumentFilter(criterion, ImagingParamsKeys.WITH_DOCUMENT) : '',
     buildSimpleFilter(criterion.studyUid, ImagingParamsKeys.STUDY_UID, IMAGING_STUDY_UID_URL),
     buildSimpleFilter(criterion.seriesUid, ImagingParamsKeys.SERIES_UID),
     buildEncounterDateFilter(
@@ -544,7 +600,7 @@ const buildImagingFilter = (criterion: ImagingDataType): string[] => {
 
 const buildPregnancyFilter = (criterion: PregnancyDataType): string[] => {
   return [
-    'subject.active=true',
+    ...(USE_FHIR_FILTER_ACTIVE ? ['subject.active=true'] : []),
     `questionnaire.name=${FormNames.PREGNANCY}`,
     'status=in-progress,completed',
     filtersBuilders(
@@ -604,7 +660,7 @@ const buildPregnancyFilter = (criterion: PregnancyDataType): string[] => {
 
 const buildHospitFilter = (criterion: HospitDataType): string[] => {
   return [
-    'subject.active=true',
+    ...(USE_FHIR_FILTER_ACTIVE ? ['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 80c7631c8..d40eb7379 100644
--- a/src/utils/filters.ts
+++ b/src/utils/filters.ts
@@ -17,6 +17,7 @@ import { ScopeElement, SimpleCodeType, ValueSet } from 'types'
 import { getDurationRangeLabel } from './age'
 import { CohortsType, CohortsTypeLabel } from 'types/cohorts'
 import { Hierarchy } from 'types/hierarchy'
+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 97aa4a3d6..82b95cdd1 100644
--- a/src/utils/mappers.ts
+++ b/src/utils/mappers.ts
@@ -24,6 +24,13 @@ import services from 'services/aphp'
 import extractFilterParams, { FhirFilterValue } from './fhirFilterParser'
 import { Hierarchy } from 'types/hierarchy'
 import { EncounterParamsKeys, ObservationParamsKeys, mapDocumentStatusesFromRequestParam } from 'mappers/filters'
+import { CodeableConcept, Coding, Condition } from 'fhir/r4'
+import {
+  CONDITION_ORBIS_STATUS_EXTENSION_NAME,
+  USE_FHIR_CONDITION_MAIN_DIAGNOSIS_EXTENSION,
+  USE_FHIR_OBSERVATION_VALUE_RESTRICTION,
+  USE_FHIR_USER_SELECTED_CODE_ONLY
+} from 'constants.js'
 
 const searchReducer = (accumulator: string, currentValue: string): string =>
   accumulator || !!accumulator === false ? `${accumulator},${currentValue}` : currentValue || accumulator
@@ -142,7 +149,10 @@ export const buildObservationValueFilter = (criterion: ObservationDataType, fhir
       return `${fhirKey}=${valueComparatorFilter}${criterion.searchByValue[0]}`
     }
   }
-  return `${fhirKey}=le0,ge0`
+  if (USE_FHIR_OBSERVATION_VALUE_RESTRICTION) {
+    return `${fhirKey}=le0,ge0`
+  }
+  return ''
 }
 
 export const unbuildObservationValueFilter = (filters: string[][], currentCriterion: ObservationDataType) => {
@@ -388,3 +398,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) ||
+    (!USE_FHIR_USER_SELECTED_CODE_ONLY ? code?.coding?.[0] : undefined)
+  )
+}
+
+export const getMainDiagnosis = (conditionList: Condition[]): Condition[] => {
+  if (USE_FHIR_CONDITION_MAIN_DIAGNOSIS_EXTENSION) {
+    return conditionList.filter(
+      (condition) =>
+        !!condition?.extension
+          ?.find((ext) => ext.url === CONDITION_ORBIS_STATUS_EXTENSION_NAME)
+          ?.valueCodeableConcept?.coding?.find((c) => c.code === 'dp')
+    )
+  }
+  return conditionList
+}
diff --git a/src/utils/perimeters.ts b/src/utils/perimeters.ts
index 5aeb145b3..1abe7fe0d 100644
--- a/src/utils/perimeters.ts
+++ b/src/utils/perimeters.ts
@@ -56,3 +56,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 f85d1a1d6..88e461018 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/views/Dashboard/Dashboard.tsx b/src/views/Dashboard/Dashboard.tsx
index 6928d49b7..1bb0987b3 100644
--- a/src/views/Dashboard/Dashboard.tsx
+++ b/src/views/Dashboard/Dashboard.tsx
@@ -17,8 +17,7 @@ import useStyles from './styles'
 
 import { useAppSelector, useAppDispatch } from 'state'
 import ImagingList from 'components/Dashboard/ImagingList'
-import { ODD_IMAGING } from '../../constants'
-import { MeState } from 'state/me'
+import { ODD_IMAGING, USE_FHIR_FACETS_EXTENSION, USE_FHIR_RESOURCE_LISTS } from '../../constants'
 
 type Tabs = { label: string; value: string; to: string; disabled: boolean | undefined } | undefined
 
@@ -36,7 +35,7 @@ const Dashboard: React.FC<{
 
   const perimetreIds = location.search.substr(1)
 
-  const [selectedTab, selectTab] = useState(tabName || 'preview')
+  const [selectedTab, selectTab] = useState(tabName || (USE_FHIR_FACETS_EXTENSION ? 'preview' : 'patients'))
   const [tabs, setTabs] = useState<Tabs[]>([])
 
   const open = useAppSelector((state) => state.drawer)
@@ -48,10 +47,12 @@ 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: !USE_FHIR_FACETS_EXTENSION },
           { label: 'Patients', value: 'patients', to: '/my-patients/patients', disabled: false },
-          { label: 'Documents', value: 'documents', to: '/my-patients/documents', disabled: false },
-          ...(ODD_IMAGING ? [{ label: 'Imagerie', value: 'imaging', to: '/my-patients/imaging', disabled: false }] : [])
+          { label: 'Documents', value: 'documents', to: '/my-patients/documents', disabled: !USE_FHIR_RESOURCE_LISTS },
+          ...(ODD_IMAGING
+            ? [{ label: 'Imagerie', value: 'imaging', to: '/my-patients/imaging', disabled: !USE_FHIR_RESOURCE_LISTS }]
+            : [])
         ])
         break
       case 'cohort':
@@ -62,18 +63,40 @@ const Dashboard: React.FC<{
             to: `/cohort/new/${dashboard.requestId}/${dashboard.snapshotId}`,
             disabled: false
           },
-          { label: 'Aperçu cohorte', value: 'preview', to: `/cohort/${cohortId}/preview`, disabled: false },
+          {
+            label: 'Aperçu cohorte',
+            value: 'preview',
+            to: `/cohort/${cohortId}/preview`,
+            disabled: !USE_FHIR_FACETS_EXTENSION
+          },
           { label: 'Données patient', value: 'patients', to: `/cohort/${cohortId}/patients`, disabled: false },
-          { label: 'Documents cliniques', value: 'documents', to: `/cohort/${cohortId}/documents`, disabled: false },
+          {
+            label: 'Documents cliniques',
+            value: 'documents',
+            to: `/cohort/${cohortId}/documents`,
+            disabled: !USE_FHIR_RESOURCE_LISTS
+          },
           ...(ODD_IMAGING
-            ? [{ label: 'Imagerie', value: 'imaging', to: `/cohort/${cohortId}/imaging`, disabled: false }]
+            ? [
+                {
+                  label: 'Imagerie',
+                  value: 'imaging',
+                  to: `/cohort/${cohortId}/imaging`,
+                  disabled: !USE_FHIR_RESOURCE_LISTS
+                }
+              ]
             : [])
         ])
         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: !USE_FHIR_FACETS_EXTENSION
+          },
           { label: 'Données patient', value: 'patients', to: `/cohort/new/patients`, disabled: true },
           { label: 'Documents cliniques', value: 'documents', to: `/cohort/new/documents`, disabled: true },
           ...(ODD_IMAGING ? [{ label: 'Imagerie', value: 'imaging', to: `/cohort/new/imaging`, disabled: true }] : [])
@@ -82,7 +105,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${location.search}`, disabled: false },
+          {
+            label: 'Aperçu',
+            value: 'preview',
+            to: `/perimeters/preview${location.search}`,
+            disabled: !USE_FHIR_FACETS_EXTENSION
+          },
           {
             label: 'Données patient',
             value: 'patients',
@@ -93,10 +121,17 @@ const Dashboard: React.FC<{
             label: 'Documents cliniques',
             value: 'documents',
             to: `/perimeters/documents${location.search}`,
-            disabled: false
+            disabled: !USE_FHIR_RESOURCE_LISTS
           },
           ...(ODD_IMAGING
-            ? [{ label: 'Imagerie', value: 'imaging', to: `/perimeters/imaging${location.search}`, disabled: false }]
+            ? [
+                {
+                  label: 'Imagerie',
+                  value: 'imaging',
+                  to: `/perimeters/imaging${location.search}`,
+                  disabled: !USE_FHIR_RESOURCE_LISTS
+                }
+              ]
             : [])
         ])
         break