diff --git a/src/components/CreationCohort/DiagramView/components/CriteriaCard/components/CriteriaCardContent/CriteriaCardContent.tsx b/src/components/CreationCohort/DiagramView/components/CriteriaCard/components/CriteriaCardContent/CriteriaCardContent.tsx
index 907bc41ff..7a25bbba1 100644
--- a/src/components/CreationCohort/DiagramView/components/CriteriaCard/components/CriteriaCardContent/CriteriaCardContent.tsx
+++ b/src/components/CreationCohort/DiagramView/components/CriteriaCard/components/CriteriaCardContent/CriteriaCardContent.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, useState, useEffect, useRef } from 'react'
+import React, { Fragment, useEffect, useRef, useState } from 'react'
 import moment from 'moment'
 
 import Chip from '@mui/material/Chip'
@@ -10,11 +10,12 @@ import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
 
 import { useAppSelector } from 'state'
-import { DocType, SearchByTypes, SelectedCriteriaType } from 'types'
+import { DocType, ScopeTreeRow, SearchByTypes, SelectedCriteriaType } from 'types'
 
 import docTypes from 'assets/docTypes.json'
 
 import useStyles from './styles'
+import { RESSOURCE_TYPE_PATIENT } from 'utils/cohortCreation'
 
 type CriteriaCardContentProps = {
   currentCriteria: SelectedCriteriaType
@@ -917,6 +918,29 @@ const CriteriaCardContent: React.FC<CriteriaCardContentProps> = ({ currentCriter
         )
       ]
     }
+    const displaySelectedExecutiveUnits = (hospitalList: ScopeTreeRow[], tooltip?: boolean) => {
+      return hospitalList && hospitalList.length > 0
+        ? hospitalList.map((item) => item.name).reduce(tooltip ? tooltipReducer : reducer)
+        : ''
+    }
+
+    if (_currentCriteria.type !== RESSOURCE_TYPE_PATIENT) {
+      content = [
+        ...content,
+        _currentCriteria && _currentCriteria?.encounterService && _currentCriteria?.encounterService.length > 0 && (
+          <Chip
+            className={classes.criteriaChip}
+            label={
+              <Tooltip title={displaySelectedExecutiveUnits(_currentCriteria?.encounterService)}>
+                <Typography style={{ maxWidth: 500 }} noWrap>
+                  {displaySelectedExecutiveUnits(_currentCriteria?.encounterService)}
+                </Typography>
+              </Tooltip>
+            }
+          />
+        )
+      ]
+    }
 
     content = content.filter((c) => c) // Filter null element
     return content
diff --git a/src/components/CreationCohort/DiagramView/components/CriteriaCard/styles.ts b/src/components/CreationCohort/DiagramView/components/CriteriaCard/styles.ts
index d0d0a1ca2..0965b0307 100644
--- a/src/components/CreationCohort/DiagramView/components/CriteriaCard/styles.ts
+++ b/src/components/CreationCohort/DiagramView/components/CriteriaCard/styles.ts
@@ -11,7 +11,7 @@ const useStyles = makeStyles((theme: Theme) => ({
     padding: 8,
     marginTop: 12,
     minWidth: 400,
-    maxWidth: 800,
+    maxWidth: 850,
     position: 'relative',
     '&::before': {
       width: 38,
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/AdvancedInputs/AdvancedInputs.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/AdvancedInputs/AdvancedInputs.tsx
index b099b6d4e..51138d876 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/AdvancedInputs/AdvancedInputs.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/AdvancedInputs/AdvancedInputs.tsx
@@ -1,12 +1,15 @@
 import React, { useState } from 'react'
 
-import { Collapse, Typography, Grid, IconButton } from '@mui/material'
+import { Collapse, Grid, IconButton, Typography } from '@mui/material'
 
 import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
 
 import OccurrencesInputs from './OccurrencesInputs/OccurrencesInputs'
 import VisitInputs from './VisitInputs/VisitInputs'
+import PopulationCard from '../../../../PopulationCard/PopulationCard'
+import { UNITE_EXECUTRICE } from 'utils/cohortCreation'
+import { ScopeTreeRow } from 'types'
 
 type AdvancedInputsProps = {
   form: 'cim10' | 'ccam' | 'ghm' | 'document' | 'medication' | 'biology'
@@ -26,6 +29,10 @@ const AdvancedInputs: React.FC<AdvancedInputsProps> = (props) => {
 
   const [checked, setCheck] = useState(optionsIsUsed)
 
+  const _onSubmitExecutiveUnits = (_selectedExecutiveUnits: ScopeTreeRow[] | undefined) => {
+    onChangeValue('encounterService', _selectedExecutiveUnits)
+  }
+
   return (
     <Grid container direction="column">
       <Grid
@@ -46,6 +53,18 @@ const AdvancedInputs: React.FC<AdvancedInputsProps> = (props) => {
       </Grid>
 
       <Collapse in={checked} unmountOnExit>
+        <Grid item container direction="row" alignItems="center" style={{ padding: '1em' }}>
+          <PopulationCard
+            form={form}
+            label={UNITE_EXECUTRICE}
+            title={UNITE_EXECUTRICE}
+            executiveUnits={selectedCriteria?.encounterService ?? []}
+            isAcceptEmptySelection={true}
+            isDeleteIcon={true}
+            onChangeExecutiveUnits={_onSubmitExecutiveUnits}
+          />
+        </Grid>
+
         <VisitInputs selectedCriteria={selectedCriteria} onChangeValue={onChangeValue} />
 
         <OccurrencesInputs form={form} selectedCriteria={selectedCriteria} onChangeValue={onChangeValue} />
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/SupportedForm/SupportedForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/SupportedForm/SupportedForm.tsx
index 687eeb0ae..4ae906db1 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/SupportedForm/SupportedForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/SupportedForm/SupportedForm.tsx
@@ -11,9 +11,9 @@ import {
   IconButton,
   Slider,
   Switch,
+  TextField,
   Tooltip,
-  Typography,
-  TextField
+  Typography
 } from '@mui/material'
 import InfoIcon from '@mui/icons-material/Info'
 
@@ -23,11 +23,11 @@ import ProvenanceDestinationInputs from './SupportedInputs/ProvenanceDestination
 import OtherInputs from './SupportedInputs/OtherInputs'
 
 import VisitInputs from '../AdvancedInputs/VisitInputs/VisitInputs'
-// import { InputAutocompleteAsync as AutocompleteAsync } from 'components/Inputs'
-
 import useStyles from './styles'
 
-import { EncounterDataType } from 'types'
+import { EncounterDataType, ScopeTreeRow } from 'types'
+import PopulationCard from '../../../../PopulationCard/PopulationCard'
+import { STRUCTURE_HOSPITALIERE_DE_PRIS_EN_CHARGE } from 'utils/cohortCreation'
 
 type SupportedFormProps = {
   criteria: any
@@ -106,6 +106,10 @@ const SupportedForm: React.FC<SupportedFormProps> = (props) => {
     setDefaultValues(_defaultValues)
   }
 
+  const _onSubmitExecutiveUnits = (_selectedExecutiveUnits: ScopeTreeRow[] | undefined) => {
+    _onChangeValue('encounterService', _selectedExecutiveUnits)
+  }
+
   if (
     criteria?.data?.admissionModes === 'loading' ||
     criteria?.data?.entryModes === 'loading' ||
@@ -194,6 +198,17 @@ const SupportedForm: React.FC<SupportedFormProps> = (props) => {
             />
           </Grid>
 
+          <Grid style={{ display: 'grid', alignItems: 'center', margin: '0 1em' }}>
+            <PopulationCard
+              form={'supported'}
+              label={STRUCTURE_HOSPITALIERE_DE_PRIS_EN_CHARGE}
+              title={STRUCTURE_HOSPITALIERE_DE_PRIS_EN_CHARGE}
+              executiveUnits={defaultValues?.encounterService ?? []}
+              isAcceptEmptySelection={true}
+              onChangeExecutiveUnits={_onSubmitExecutiveUnits}
+            />
+          </Grid>
+
           <FormLabel style={{ padding: '1em', display: 'flex', alignItems: 'center' }} component="legend">
             Âge au moment de la prise en charge
             <Tooltip title="La valeur par défaut sera prise en compte si le sélecteur d'âge n'a pas été modifié.">
diff --git a/src/components/CreationCohort/DiagramView/components/PopulationCard/PopulationCard.tsx b/src/components/CreationCohort/DiagramView/components/PopulationCard/PopulationCard.tsx
index efacad83c..3c8dff961 100644
--- a/src/components/CreationCohort/DiagramView/components/PopulationCard/PopulationCard.tsx
+++ b/src/components/CreationCohort/DiagramView/components/PopulationCard/PopulationCard.tsx
@@ -1,6 +1,6 @@
-import React, { useState, useEffect, useRef } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 
-import { Button, IconButton, Chip, CircularProgress, Typography } from '@mui/material'
+import { Button, Chip, CircularProgress, IconButton, Tooltip, Typography } from '@mui/material'
 
 import EditIcon from '@mui/icons-material/Edit'
 import CloseIcon from '@mui/icons-material/Close'
@@ -9,18 +9,31 @@ import MoreHorizIcon from '@mui/icons-material/MoreHoriz'
 import ModalRightError from './components/ModalRightError'
 import PopulationRightPanel from './components/PopulationRightPanel'
 
-import { useAppSelector, useAppDispatch } from 'state'
-import { CohortCreationState, buildCohortCreation } from 'state/cohortCreation'
-import { ScopeState, fetchScopesList } from 'state/scope'
+import { useAppDispatch, useAppSelector } from 'state'
+import { buildCohortCreation, CohortCreationState } from 'state/cohortCreation'
+import { fetchScopesList, ScopeState } from 'state/scope'
 import { MeState } from 'state/me'
 
 import { ScopeTreeRow } from 'types'
-import { getSelectedScopes, filterScopeTree } from 'utils/scopeTree'
+import { filterScopeTree, getSelectedScopes } from 'utils/scopeTree'
 
 import useStyles from './styles'
+import InfoIcon from '@mui/icons-material/Info'
+import scopeType from 'data/scope_type.json'
+
+export type populationCardPropsType = {
+  label?: string
+  title?: string
+  form?: 'cim10' | 'ccam' | 'ghm' | 'document' | 'medication' | 'biology' | 'supported'
+  executiveUnits?: (ScopeTreeRow | undefined)[]
+  isAcceptEmptySelection?: boolean
+  isDeleteIcon?: boolean
+  onChangeExecutiveUnits?: (_selectedPopulations: ScopeTreeRow[] | undefined) => void
+}
 
-const PopulationCard: React.FC = () => {
-  const classes = useStyles()
+const PopulationCard: React.FC<populationCardPropsType> = (props) => {
+  const { label, title, form, executiveUnits, onChangeExecutiveUnits, isAcceptEmptySelection, isDeleteIcon } = props
+  const classes = useStyles(props)
   const dispatch = useAppDispatch()
   const isRendered = useRef<boolean>(false)
 
@@ -46,13 +59,24 @@ const PopulationCard: React.FC = () => {
   const [isExtended, onExtend] = useState(false)
   const [openDrawer, onChangeOpenDrawer] = useState(false)
   const [rightError, setRightError] = useState(false)
+  const [selectedItems, setSelectedItems] = useState<ScopeTreeRow[]>(
+    (executiveUnits ?? selectedPopulation ?? []).filter((item): item is ScopeTreeRow => item !== undefined)
+  )
 
-  const submitPopulation = async (_selectedPopulations: ScopeTreeRow[] | null) => {
-    if (_selectedPopulations === null) return
+  const _onChangePopulation = async (selectedPopulations: ScopeTreeRow[]) => {
+    dispatch<any>(buildCohortCreation({ selectedPopulation: selectedPopulations }))
+  }
 
-    _selectedPopulations = filterScopeTree(_selectedPopulations)
-    _selectedPopulations = _selectedPopulations.map((_selectedPopulation: ScopeTreeRow) => ({
-      ..._selectedPopulation,
+  const setUpdatedItems = (updatedSelection: ScopeTreeRow[]) => {
+    setSelectedItems(updatedSelection)
+    onChangeExecutiveUnits ? onChangeExecutiveUnits(updatedSelection) : _onChangePopulation(updatedSelection)
+  }
+
+  const _onSubmit = async (updatedSelection: ScopeTreeRow[] | null) => {
+    if (updatedSelection === null && !executiveUnits) return
+    updatedSelection = filterScopeTree(updatedSelection ?? [])
+    updatedSelection = updatedSelection.map((selectedPopulations: ScopeTreeRow) => ({
+      ...selectedPopulations,
       subItems: []
     }))
 
@@ -60,9 +84,15 @@ const PopulationCard: React.FC = () => {
     onChangeOpenDrawer(false)
   }
 
+  const _onDelete = (index: number) => {
+    const updatedSelection: ScopeTreeRow[] = [...selectedItems]
+    updatedSelection.splice(index, 1)
+    setUpdatedItems(updatedSelection)
+  }
+
   const fetchScopeTree = () => {
     if (scopesList && scopesList.length === 0) {
-      dispatch(fetchScopesList())
+      dispatch(fetchScopesList({}))
     }
   }
 
@@ -73,26 +103,27 @@ const PopulationCard: React.FC = () => {
   useEffect(() => {
     let _rightError = false
 
-    const populationWithRightError = selectedPopulation
-      ? selectedPopulation.filter((selectedPopulation) => selectedPopulation === undefined)
+    const populationWithRightError = selectedItems
+      ? selectedItems.filter((selectedPopulation) => selectedPopulation === undefined)
       : []
     if (populationWithRightError && populationWithRightError.length > 0) {
       _rightError = true
     }
 
     setRightError(_rightError)
-  }, [selectedPopulation])
+  }, [selectedItems])
 
   useEffect(() => {
     if (
       !isRendered.current &&
+      !executiveUnits &&
       !openDrawer &&
       scopesList?.length === 1 &&
       requestState?.requestId &&
-      (selectedPopulation === null || selectedPopulation?.length === 0)
+      (selectedItems === null || selectedItems?.length === 0)
     ) {
       const savedSelectedItems: ScopeTreeRow[] = getSelectedScopes(scopesList[0], [], scopesList)
-      submitPopulation(savedSelectedItems)
+      _onSubmit(savedSelectedItems)
       isRendered.current = true
     } else {
       isRendered.current = false
@@ -107,19 +138,42 @@ const PopulationCard: React.FC = () => {
             <CircularProgress />
           </div>
         </div>
-      ) : selectedPopulation !== null ? (
+      ) : selectedItems !== null ? (
         <div className={classes.populationCard}>
           <div className={classes.leftDiv}>
-            <Typography variant="h6" align="left" style={{ whiteSpace: 'nowrap' }}>
-              Population source :
+            <Typography className={classes.typography} variant={form ? undefined : 'h6'} align="left">
+              {label ?? 'Population source'}
+              {form && (
+                <>
+                  <Tooltip
+                    title={
+                      <>
+                        {'- Le niveau hiérarchique de rattachement est : ' + scopeType?.criteriaType[form] + '.'}
+                        <br />
+                        {(form === 'supported'
+                          ? '- La structure hospitalière de prise en charge'
+                          : "- L'unité exécutrice") +
+                          ' est la structure élémentaire de prise en charge des malades par une équipe soignante ou médico-technique identifiées par leurs fonctions et leur organisation.'}
+                      </>
+                    }
+                  >
+                    <InfoIcon fontSize="small" color="primary" style={{ marginLeft: 4 }} />
+                  </Tooltip>
+                </>
+              )}
             </Typography>
 
             <div className={classes.chipContainer}>
               {isExtended ? (
                 <>
-                  {selectedPopulation &&
-                    selectedPopulation.map((pop: any, index: number) => (
-                      <Chip className={classes.populationChip} key={`${index}-${pop.name}`} label={pop.name} />
+                  {selectedItems &&
+                    selectedItems.map((pop: any, index: number) => (
+                      <Chip
+                        className={classes.populationChip}
+                        key={`${index}-${pop.name}`}
+                        label={pop.name}
+                        onDelete={isDeleteIcon ? () => _onDelete(index) : undefined}
+                      />
                     ))}
                   <IconButton
                     size="small"
@@ -130,17 +184,27 @@ const PopulationCard: React.FC = () => {
                 </>
               ) : (
                 <>
-                  {selectedPopulation &&
-                    selectedPopulation
+                  {selectedItems &&
+                    selectedItems
                       .slice(0, 4)
                       .map((pop: any, index: number) =>
                         pop ? (
-                          <Chip className={classes.populationChip} key={`${index}-${pop.name}`} label={pop.name} />
+                          <Chip
+                            className={classes.populationChip}
+                            key={`${index}-${pop.name}`}
+                            label={pop.name}
+                            onDelete={isDeleteIcon ? () => _onDelete(index) : undefined}
+                          />
                         ) : (
-                          <Chip className={classes.populationChip} key={index} label={'?'} />
+                          <Chip
+                            className={classes.populationChip}
+                            key={index}
+                            label={'?'}
+                            onDelete={isDeleteIcon ? () => _onDelete(index) : undefined}
+                          />
                         )
                       )}
-                  {selectedPopulation && selectedPopulation.length > 4 && (
+                  {selectedItems && selectedItems.length > 4 && (
                     <IconButton
                       size="small"
                       /*classes={{ label: classes.populationLabel }}*/
@@ -164,26 +228,23 @@ const PopulationCard: React.FC = () => {
         </div>
       ) : (
         <div className={classes.centerContainer}>
-          <Button
-            className={classes.actionButton}
-            onClick={() => {
-              onChangeOpenDrawer(true)
-            }}
-          >
-            Choisir une population source
+          <Button className={classes.actionButton} onClick={() => onChangeOpenDrawer(true)}>
+            {title ?? 'Choisir une population source'}
           </Button>
         </div>
       )}
 
-      <ModalRightError
-        open={rightError}
-        handleClose={() => {
-          onChangeOpenDrawer(true)
-          setRightError(false)
-        }}
-      />
+      <ModalRightError open={rightError} handleClose={() => onChangeOpenDrawer(true)} />
 
-      <PopulationRightPanel open={openDrawer} onConfirm={submitPopulation} onClose={() => onChangeOpenDrawer(false)} />
+      <PopulationRightPanel
+        open={openDrawer}
+        title={title}
+        isAcceptEmptySelection={isAcceptEmptySelection}
+        selectedPopulation={selectedItems}
+        executiveUnitType={form ?? undefined}
+        onConfirm={_onSubmit}
+        onClose={() => onChangeOpenDrawer(false)}
+      />
     </>
   )
 }
diff --git a/src/components/CreationCohort/DiagramView/components/PopulationCard/components/PopulationRightPanel.tsx b/src/components/CreationCohort/DiagramView/components/PopulationCard/components/PopulationRightPanel.tsx
index d596943f9..447a0b22c 100644
--- a/src/components/CreationCohort/DiagramView/components/PopulationCard/components/PopulationRightPanel.tsx
+++ b/src/components/CreationCohort/DiagramView/components/PopulationCard/components/PopulationRightPanel.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
 
 import Button from '@mui/material/Button'
 import Drawer from '@mui/material/Drawer'
@@ -7,29 +7,30 @@ import Typography from '@mui/material/Typography'
 import ScopeTree from 'components/ScopeTree/ScopeTree'
 import { ScopeTreeRow } from 'types'
 
-import { useAppSelector } from 'state'
-
 import useStyles from './styles'
 import ScopeSearchBar from 'components/Inputs/ScopeSearchBar/ScopeSearchBar'
 
 type PopulationRightPanelProps = {
   open: boolean
-  onConfirm: (selectedPopulation: ScopeTreeRow[] | null) => void
+  title?: string
+  executiveUnitType?: string
+  selectedPopulation: ScopeTreeRow[]
+  isAcceptEmptySelection?: boolean
+  onConfirm: (selectedPopulation: ScopeTreeRow[]) => void
   onClose: () => void
 }
 
 const PopulationRightPanel: React.FC<PopulationRightPanelProps> = (props) => {
-  const { open, onConfirm, onClose } = props
+  const { open, title, executiveUnitType, selectedPopulation, isAcceptEmptySelection, onConfirm, onClose } = props
 
   const classes = useStyles()
 
-  const { selectedPopulation = [] } = useAppSelector((state) => state.cohortCreation.request || {})
-  const [_selectedPopulation, onChangeSelectedPopulation] = useState<ScopeTreeRow[]>([])
+  const [_selectedPopulation, _setSelectedPopulation] = useState<ScopeTreeRow[]>(selectedPopulation)
   const [searchInput, setSearchInput] = useState('')
 
   useEffect(() => {
-    onChangeSelectedPopulation(
-      selectedPopulation !== null ? (selectedPopulation.filter((elem) => elem !== undefined) as ScopeTreeRow[]) : []
+    _setSelectedPopulation(
+      selectedPopulation !== null ? (selectedPopulation?.filter((elem) => elem !== undefined) as ScopeTreeRow[]) : []
     )
   }, [open]) // eslint-disable-line
 
@@ -40,7 +41,7 @@ const PopulationRightPanel: React.FC<PopulationRightPanelProps> = (props) => {
     <Drawer anchor="right" open={open} onClose={onClose}>
       <div className={classes.root}>
         <div className={classes.drawerTitleContainer}>
-          <Typography className={classes.title}>Structure hospitalière</Typography>
+          <Typography className={classes.title}>{title ?? 'Structure hospitalière'}</Typography>
         </div>
 
         <div className={classes.drawerContentContainer}>
@@ -48,9 +49,10 @@ const PopulationRightPanel: React.FC<PopulationRightPanelProps> = (props) => {
             <ScopeSearchBar searchInput={searchInput} onChangeInput={setSearchInput} />
           </div>
           <ScopeTree
+            executiveUnitType={executiveUnitType}
             searchInput={searchInput}
             defaultSelectedItems={_selectedPopulation}
-            onChangeSelectedItem={onChangeSelectedPopulation}
+            onChangeSelectedItem={_setSelectedPopulation}
           />
         </div>
 
@@ -59,7 +61,10 @@ const PopulationRightPanel: React.FC<PopulationRightPanelProps> = (props) => {
             Annuler
           </Button>
           <Button
-            disabled={!_selectedPopulation || (_selectedPopulation && _selectedPopulation.length === 0)}
+            disabled={
+              !isAcceptEmptySelection &&
+              (!_selectedPopulation || (_selectedPopulation && _selectedPopulation.length === 0))
+            }
             onClick={() => onConfirm(_selectedPopulation)}
             variant="contained"
           >
diff --git a/src/components/CreationCohort/DiagramView/components/PopulationCard/styles.ts b/src/components/CreationCohort/DiagramView/components/PopulationCard/styles.ts
index 61e0c3526..41b93bcc9 100644
--- a/src/components/CreationCohort/DiagramView/components/PopulationCard/styles.ts
+++ b/src/components/CreationCohort/DiagramView/components/PopulationCard/styles.ts
@@ -1,5 +1,6 @@
 import { makeStyles } from '@mui/styles'
 import { Theme } from '@mui/material/styles'
+import { populationCardPropsType } from './PopulationCard'
 
 const useStyles = makeStyles((theme: Theme) => ({
   populationCard: {
@@ -9,11 +10,19 @@ const useStyles = makeStyles((theme: Theme) => ({
     'border-radius': 4,
     backgroundColor: '#FFFFFF',
     padding: '8px 16px',
-    border: '3px solid #D3DEE8',
+    border: (props: populationCardPropsType) => (props.form ? '1px solid #D0D7D8' : '3px solid #D3DEE8'),
+    '&:hover': {
+      'border-color': (props: populationCardPropsType) => (props.form ? 'rgb(21,61,138)' : '')
+    },
     flex: 1,
     margin: '12px 0',
     position: 'relative'
   },
+  typography: {
+    padding: (props: populationCardPropsType) => (props.form ? '0 0em 0px' : '0 1em 8px'),
+    display: 'flex',
+    alignItems: 'center'
+  },
   centerContainer: {
     width: '100%',
     display: 'flex',
diff --git a/src/components/ScopeTree/ScopeTree.tsx b/src/components/ScopeTree/ScopeTree.tsx
index 3704b5845..6cd20453b 100644
--- a/src/components/ScopeTree/ScopeTree.tsx
+++ b/src/components/ScopeTree/ScopeTree.tsx
@@ -47,6 +47,7 @@ type ScopeTreeListItemProps = {
   onSelect: (row: ScopeTreeRow) => void
   isIndeterminated: (row: any) => boolean | undefined
   isSelected: (searchedItem: TreeElement, selectedItems: ScopeTreeRow[], allItems: ScopeTreeRow[]) => boolean
+  executiveUnitType?: string
 }
 
 const ScopeTreeListItem: React.FC<ScopeTreeListItemProps> = (props) => {
@@ -62,7 +63,8 @@ const ScopeTreeListItem: React.FC<ScopeTreeListItemProps> = (props) => {
     onExpand,
     onSelect,
     isIndeterminated,
-    isSelected
+    isSelected,
+    executiveUnitType
   } = props
 
   const classes = useStyles()
@@ -93,7 +95,6 @@ const ScopeTreeListItem: React.FC<ScopeTreeListItemProps> = (props) => {
               </IconButton>
             )}
           </TableCell>
-
           <TableCell align="center" padding="checkbox">
             <Checkbox
               color="secondary"
@@ -105,7 +106,6 @@ const ScopeTreeListItem: React.FC<ScopeTreeListItemProps> = (props) => {
               inputProps={{ 'aria-labelledby': labelId }}
             />
           </TableCell>
-
           <TableCell>
             {debouncedSearchTerm && row.full_path ? (
               <Breadcrumbs maxItems={2}>
@@ -122,14 +122,18 @@ const ScopeTreeListItem: React.FC<ScopeTreeListItemProps> = (props) => {
               <Typography>{row.name}</Typography>
             )}
           </TableCell>
-
           <TableCell align="center" style={{ cursor: 'pointer' }} onClick={() => onSelect(row)}>
             <Typography>{displayDigit(row.quantity)}</Typography>
           </TableCell>
-
-          <TableCell align="center" style={{ cursor: 'pointer' }} onClick={() => onSelect(row)}>
-            <Typography>{row.access ?? parentAccess}</Typography>
-          </TableCell>
+          {executiveUnitType ? (
+            <TableCell align="center" style={{ cursor: 'pointer' }} onClick={() => onSelect(row)}>
+              <Typography>{row.type ?? '-'}</Typography>
+            </TableCell>
+          ) : (
+            <TableCell align="center" style={{ cursor: 'pointer' }} onClick={() => onSelect(row)}>
+              <Typography>{row.access ?? parentAccess}</Typography>
+            </TableCell>
+          )}
         </TableRow>
       )}
     </>
@@ -140,9 +144,15 @@ type ScopeTreeProps = {
   defaultSelectedItems: ScopeTreeRow[]
   onChangeSelectedItem: (selectedItems: ScopeTreeRow[]) => void
   searchInput: string
+  executiveUnitType?: string
 }
 
-const ScopeTree: React.FC<ScopeTreeProps> = ({ defaultSelectedItems, onChangeSelectedItem, searchInput }) => {
+const ScopeTree: React.FC<ScopeTreeProps> = ({
+  defaultSelectedItems,
+  onChangeSelectedItem,
+  searchInput,
+  executiveUnitType
+}) => {
   const classes = useStyles()
   const dispatch = useAppDispatch()
 
@@ -242,6 +252,7 @@ const ScopeTree: React.FC<ScopeTreeProps> = ({ defaultSelectedItems, onChangeSel
         selectedItems: selectedItems,
         scopesList: _rootRows,
         openPopulation: openPopulation,
+        type: executiveUnitType,
         signal: controllerRef.current?.signal
       })
     ).unwrap()
@@ -384,7 +395,21 @@ const ScopeTree: React.FC<ScopeTreeProps> = ({ defaultSelectedItems, onChangeSel
     },
     { id: 'name', align: 'left', disablePadding: false, disableOrderBy: true, label: 'Nom' },
     { id: 'quantity', align: 'center', disablePadding: false, disableOrderBy: true, label: 'Nombre de patients' },
-    { id: 'deidentified', align: 'center', disablePadding: false, disableOrderBy: true, label: 'Accès' }
+    executiveUnitType
+      ? {
+          id: 'deidentified',
+          align: 'center',
+          disablePadding: false,
+          disableOrderBy: true,
+          label: 'Type'
+        }
+      : {
+          id: 'type',
+          align: 'center',
+          disablePadding: false,
+          disableOrderBy: true,
+          label: 'Accès'
+        }
   ]
 
   return (
@@ -435,6 +460,7 @@ const ScopeTree: React.FC<ScopeTreeProps> = ({ defaultSelectedItems, onChangeSel
                           onSelect={_onSelect}
                           isIndeterminated={_isIndeterminated}
                           isSelected={isSelected}
+                          executiveUnitType={executiveUnitType}
                         />
                         {openPopulation.find((id) => _row.id === id) &&
                           _row.subItems &&
@@ -458,6 +484,7 @@ const ScopeTree: React.FC<ScopeTreeProps> = ({ defaultSelectedItems, onChangeSel
                         onSelect={_onSelect}
                         isIndeterminated={_isIndeterminated}
                         isSelected={isSelected}
+                        executiveUnitType={executiveUnitType}
                       />
                       {openPopulation.find((id) => row.id === id) &&
                         row.subItems &&
diff --git a/src/data/scope_type.json b/src/data/scope_type.json
new file mode 100644
index 000000000..10bc8500b
--- /dev/null
+++ b/src/data/scope_type.json
@@ -0,0 +1,12 @@
+{
+  "criteriaType": {
+    "biology": "Hôpital",
+    "ccam": "Unité Fonctionnelle (UF)",
+    "cim10": "Unité Fonctionnelle (UF)",
+    "ghm": "Hôpital",
+    "medication": "Hôpital",
+    "document": "Hôpital",
+    "supported": "AP-HP"
+  },
+  "typeLevel": [["AP-HP"], ["GH", "GHU"], ["Hôpital"], ["Pôle/DMU"], ["Unité Fonctionnelle (UF)"]]
+}
diff --git a/src/services/aphp/callApi.ts b/src/services/aphp/callApi.ts
index f255de898..7da51950c 100644
--- a/src/services/aphp/callApi.ts
+++ b/src/services/aphp/callApi.ts
@@ -1,6 +1,6 @@
 import apiFhir from '../apiFhir'
 
-import { CohortComposition, SearchByTypes, FHIR_API_Response, IScope } from 'types'
+import { CohortComposition, FHIR_API_Response, IScope, SearchByTypes } from 'types'
 import {
   IBinary,
   IClaim,
@@ -619,17 +619,17 @@ export const fetchMedicationAdministration = async (args: fetchMedicationAdminis
 type fetchScopeProps = {
   perimetersIds?: string[]
   cohortIds?: string[]
-  types?: string[]
+  type: string[]
 }
 export const fetchScope: (args: fetchScopeProps) => Promise<AxiosResponse<IScope | unknown>> = async (
   args: fetchScopeProps
 ) => {
-  const { perimetersIds, cohortIds, types } = args
+  const { perimetersIds, cohortIds, type } = args
 
   let options: string[] = []
   if (perimetersIds && perimetersIds.length > 0) options = [...options, `local_id=${perimetersIds.join(',')}`] // eslint-disable-line
   if (cohortIds && cohortIds.length > 0) options = [...options, `cohort_id=${cohortIds.join(',')}`] // eslint-disable-line
-  if (types && types.length > 0) options = [...options, `type_source_value=${types.join(',')}`] // eslint-disable-line
+  if (type && type.length > 0) options = [...options, `type_source_value=${type.join(',')}`] // eslint-disable-line
 
   const response: AxiosResponse<IScope | unknown> = await apiBackend.get(
     `accesses/perimeters/read-patient/?${options.reduce(optionsReducer)}`
diff --git a/src/services/aphp/servicePerimeters.ts b/src/services/aphp/servicePerimeters.ts
index 495bfb8f3..3e79e37bb 100644
--- a/src/services/aphp/servicePerimeters.ts
+++ b/src/services/aphp/servicePerimeters.ts
@@ -12,6 +12,7 @@ import { fetchEncounter, fetchGroup, fetchPatient, fetchScope } from './callApi'
 
 import apiBackend from '../apiBackend'
 import { sortByQuantityAndName } from 'utils/scopeTree'
+import scopeType from '../../data/scope_type.json'
 
 const loadingItem: ScopeTreeRow = { id: 'loading', name: 'loading', quantity: 0, subItems: [] }
 
@@ -63,8 +64,8 @@ export interface IServicePerimeters {
     defaultPerimetersIds?: string[],
     cohortIds?: string[],
     noPerimetersIdsFetch?: boolean,
-    signal?: AbortSignal,
-    types?: string[]
+    type?: string,
+    signal?: AbortSignal
   ) => Promise<ScopePage[]>
 
   /**
@@ -76,7 +77,7 @@ export interface IServicePerimeters {
    * Retour:
    *   - ScopeTreeRow[]
    */
-  getScopePerimeters: (practitionerId: string, signal?: AbortSignal) => Promise<ScopeTreeRow[]>
+  getScopePerimeters: (practitionerId: string, type?: string, signal?: AbortSignal) => Promise<ScopeTreeRow[]>
 
   /**
    * Cette fonction retoune l'ensemble des périmètres enfant d'un périmètre passé en argument
@@ -88,9 +89,10 @@ export interface IServicePerimeters {
    * Retour:
    *   - ScopeTreeRow[]
    */
-  getScopeSubItems: (
+  getScopesWithSubItems: (
     subScopesIds: string | null | undefined,
     getSubItem?: boolean,
+    type?: string,
     signal?: AbortSignal
   ) => Promise<ScopeTreeRow[]>
 
@@ -112,6 +114,7 @@ export interface IServicePerimeters {
   buildScopeTreeRow: (
     subScopes: ScopePage[],
     getSubItem?: boolean | undefined,
+    type?: string,
     signal?: AbortSignal
   ) => Promise<ScopeTreeRow[]>
 
@@ -126,6 +129,12 @@ export interface IServicePerimeters {
    * @param perimeter
    */
   getScopeName: (perimeter: any) => string
+
+  /**
+   * construire la liste des types des périmètres en haut du type. Sinon tous les types.
+   * @param type
+   */
+  getHigherTypes: (type?: string) => string[]
 }
 
 const servicesPerimeters: IServicePerimeters = {
@@ -229,8 +238,8 @@ const servicesPerimeters: IServicePerimeters = {
     defaultPerimetersIds?: string[],
     cohortIds?: string[],
     noPerimetersIdsFetch?: boolean,
-    signal?: AbortSignal,
-    types?: string[]
+    type?: string,
+    signal?: AbortSignal
   ) => {
     try {
       let perimetersIds: string[] | undefined = []
@@ -254,10 +263,12 @@ const servicesPerimeters: IServicePerimeters = {
         perimetersIds = defaultPerimetersIds
       }
 
+      const higherTypes: string[] = servicesPerimeters.getHigherTypes(type)
+
       const perimetersListReponse: any = await fetchScope({
         perimetersIds: perimetersIds,
         cohortIds: cohortIds,
-        types: types
+        type: higherTypes
       })
       if (!perimetersListReponse || !perimetersListReponse.data || !perimetersListReponse.data.results) {
         console.error(
@@ -287,32 +298,35 @@ const servicesPerimeters: IServicePerimeters = {
     }
   },
 
-  getScopePerimeters: async (practitionerId, signal?: AbortSignal) => {
+  getScopePerimeters: async (practitionerId, type?: string, signal?: AbortSignal) => {
     if (!practitionerId) return []
 
     const scopeItemList: ScopePage[] =
-      (await servicesPerimeters.getPerimeters(undefined, undefined, undefined, signal)) ?? []
+      (await servicesPerimeters.getPerimeters(undefined, undefined, undefined, type, signal)) ?? []
     const scopeTreeRowList: ScopeTreeRow[] = await servicesPerimeters.buildScopeTreeRow(
       scopeItemList,
       undefined,
+      type,
       signal
     )
     return scopeTreeRowList
   },
 
-  getScopeSubItems: async (subScopesIds: string | null | undefined, getSubItem?: boolean, signal?: AbortSignal) => {
+  getScopesWithSubItems: async (
+    subScopesIds: string | null | undefined,
+    getSubItem?: boolean,
+    type?: string,
+    signal?: AbortSignal
+  ) => {
     if (!subScopesIds) return []
-
-    const types = ['AP-HP', 'GHU', 'Hôpital', 'Groupe hospitalier (GH)', 'Pôle/DMU', 'Unité Fonctionnelle (UF)']
-
     const subScopes: ScopePage[] = await servicesPerimeters.getPerimeters(
       subScopesIds.trim().split(','),
       undefined,
       undefined,
-      signal,
-      types
+      type,
+      signal
     )
-    const scopeRowList: ScopeTreeRow[] = await servicesPerimeters.buildScopeTreeRow(subScopes, getSubItem, signal)
+    const scopeRowList: ScopeTreeRow[] = await servicesPerimeters.buildScopeTreeRow(subScopes, getSubItem, type, signal)
     return scopeRowList
   },
 
@@ -380,7 +394,12 @@ const servicesPerimeters: IServicePerimeters = {
     return result
   },
 
-  buildScopeTreeRow: async (subScopes: ScopePage[], getSubItem?: boolean | undefined, signal?: AbortSignal) => {
+  buildScopeTreeRow: async (
+    subScopes: ScopePage[],
+    getSubItem?: boolean | undefined,
+    type?: string,
+    signal?: AbortSignal
+  ) => {
     let scopeRowList: ScopeTreeRow[] = []
     for (const scopeItem of subScopes) {
       const scopeRowItem: ScopeTreeRow = { id: '', name: '', quantity: 0, subItems: [] }
@@ -393,8 +412,14 @@ const servicesPerimeters: IServicePerimeters = {
       scopeRowItem.inferior_levels_ids = scopeItem.perimeter.inferior_levels_ids
       scopeRowItem.subItems =
         getSubItem === true
-          ? await servicesPerimeters.getScopeSubItems(scopeItem.perimeter.inferior_levels_ids, undefined, signal)
+          ? await servicesPerimeters.getScopesWithSubItems(
+              scopeItem.perimeter.inferior_levels_ids,
+              undefined,
+              type,
+              signal
+            )
           : [loadingItem]
+      scopeRowItem.type = scopeItem.perimeter.type
       scopeRowList = [...scopeRowList, scopeRowItem]
     }
     scopeRowList = sortByQuantityAndName(scopeRowList)
@@ -413,6 +438,24 @@ const servicesPerimeters: IServicePerimeters = {
       return perimeter ? perimeter.name : ''
     }
     return `${perimeterID} - ${perimeter.name}`
+  },
+
+  getHigherTypes: (type?: string) => {
+    const higherTypes: string[] = []
+    if (type) {
+      let isFoundValue = false
+      for (const currentLevel of [...scopeType.typeLevel].reverse()) {
+        for (const valueInTheSameLevel of currentLevel) {
+          if (valueInTheSameLevel === type) {
+            isFoundValue = true
+          }
+          if (isFoundValue) {
+            higherTypes.push(valueInTheSameLevel)
+          }
+        }
+      }
+    }
+    return higherTypes.length > 0 ? higherTypes : scopeType.typeLevel.flat()
   }
 }
 
diff --git a/src/state/cohortCreation.ts b/src/state/cohortCreation.ts
index 13de65e48..83df0e611 100644
--- a/src/state/cohortCreation.ts
+++ b/src/state/cohortCreation.ts
@@ -31,6 +31,7 @@ export type CohortCreationState = {
   snapshotsHistory: CohortCreationSnapshotType[]
   count: CohortCreationCounterType
   selectedPopulation: (ScopeTreeRow | undefined)[] | null
+  executiveUnits: (ScopeTreeRow | undefined)[] | null
   allowSearchIpp: boolean
   selectedCriteria: SelectedCriteriaType[]
   criteriaGroup: CriteriaGroupType[]
@@ -54,6 +55,7 @@ const defaultInitialState: CohortCreationState = {
   snapshotsHistory: [],
   count: {},
   selectedPopulation: null,
+  executiveUnits: null,
   allowSearchIpp: false,
   selectedCriteria: [],
   criteriaGroup: [
diff --git a/src/state/scope.ts b/src/state/scope.ts
index 4c630fe2f..603590648 100644
--- a/src/state/scope.ts
+++ b/src/state/scope.ts
@@ -26,20 +26,25 @@ type FetchScopeListReturn = {
   aborted?: boolean
 }
 
-const fetchScopesList = createAsyncThunk<FetchScopeListReturn, AbortSignal | undefined, { state: RootState }>(
+type FetchScopeListArgs = {
+  type?: string
+  signal?: AbortSignal | undefined
+}
+
+const fetchScopesList = createAsyncThunk<FetchScopeListReturn, FetchScopeListArgs, { state: RootState }>(
   'scope/fetchScopesList',
-  async (signal: AbortSignal | undefined, { getState, dispatch }) => {
+  async ({ type, signal }, { getState, dispatch }) => {
     try {
       const state = getState()
       const { me, scope } = state
       const { scopesList } = scope
 
       if (scopesList.length) {
-        dispatch(fetchScopesListinBackground(signal))
+        dispatch(fetchScopesListinBackground({ type, signal }))
         return { scopesList: scopesList, aborted: signal?.aborted }
       } else {
         if (!me) return { scopesList: [], aborted: signal?.aborted }
-        const scopes = (await services.perimeters.getScopePerimeters(me.id, signal)) || []
+        const scopes = (await services.perimeters.getScopePerimeters(me.id, type, signal)) || []
         if (signal?.aborted) {
           return { scopesList: scopesList, aborted: signal?.aborted }
         } else {
@@ -52,19 +57,22 @@ const fetchScopesList = createAsyncThunk<FetchScopeListReturn, AbortSignal | und
     }
   }
 )
-
+type fetchScopesListinBackgroundArgs = {
+  type?: string
+  signal?: AbortSignal | undefined
+}
 const fetchScopesListinBackground = createAsyncThunk<
   FetchScopeListReturn,
-  AbortSignal | undefined,
+  fetchScopesListinBackgroundArgs,
   { state: RootState }
->('scope/fetchScopesListinBackground', async (signal: AbortSignal | undefined, { getState }) => {
+>('scope/fetchScopesListinBackground', async ({ type, signal }, { getState }) => {
   try {
     const state = getState()
     const { me, scope } = state
     const { scopesList } = scope
 
     if (!me) return { scopesList: [], aborted: signal?.aborted }
-    const scopes = (await services.perimeters.getScopePerimeters(me.id, signal)) || []
+    const scopes = (await services.perimeters.getScopePerimeters(me.id, type, signal)) || []
     return {
       scopesList: scopes.map((scope) => ({
         ...scope,
@@ -94,6 +102,7 @@ type ExpandScopeElementParams = {
   scopesList?: ScopeTreeRow[]
   selectedItems?: ScopeTreeRow[]
   openPopulation?: number[]
+  type?: string
   signal?: AbortSignal
 }
 type ExpandScopeElementReturn = {
@@ -126,22 +135,23 @@ const expandScopeElement = createAsyncThunk<ExpandScopeElementReturn, ExpandScop
     } else {
       _openPopulation = [..._openPopulation, params.rowId]
 
-      const replaceSubItems = async (items: ScopeTreeRow[]) => {
+      const replaceSubItems = async (items: ScopeTreeRow[], type?: string) => {
         let _items: ScopeTreeRow[] = []
         for (let item of items) {
           // Replace sub items element by response of back-end
           if (+item.id === +params.rowId) {
             const foundItem = item.subItems ? item.subItems.find((i: any) => i.id === 'loading') : true
             if (foundItem) {
-              const subItems: ScopeTreeRow[] = await services.perimeters.getScopeSubItems(
+              const subItems: ScopeTreeRow[] = await services.perimeters.getScopesWithSubItems(
                 item.inferior_levels_ids,
-                true,
+                false,
+                type,
                 params.signal
               )
               item = { ...item, subItems: subItems }
             }
           } else if (item.subItems && item.subItems.length !== 0) {
-            item = { ...item, subItems: await replaceSubItems(item.subItems) }
+            item = { ...item, subItems: await replaceSubItems(item.subItems, type) }
           }
           _items = [..._items, item]
 
@@ -156,7 +166,7 @@ const expandScopeElement = createAsyncThunk<ExpandScopeElementReturn, ExpandScop
         return _items
       }
 
-      _rootRows = await replaceSubItems(scopesList)
+      _rootRows = await replaceSubItems(scopesList, params.type)
     }
 
     return {
diff --git a/src/types.ts b/src/types.ts
index e49e77fe0..ff9aebae5 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -249,6 +249,7 @@ export type ScopeTreeRow = {
   cohort_id?: string
   cohort_size?: string
   cohort_tag?: string
+  type?: string
 }
 
 export type SimpleChartDataType = {
@@ -381,6 +382,7 @@ export type CriteriaItemType = {
 export type SelectedCriteriaType = {
   id: number
   error?: boolean
+  encounterService?: ScopeTreeRow[]
 } & (
   | CcamDataType
   | Cim10DataType
diff --git a/src/utils/cohortCreation.ts b/src/utils/cohortCreation.ts
index dcb0019cb..3c3e59b96 100644
--- a/src/utils/cohortCreation.ts
+++ b/src/utils/cohortCreation.ts
@@ -18,7 +18,7 @@ const REQUETEUR_VERSION = 'v1.2.1'
 const RESSOURCE_TYPE_IPP_LIST: 'IPPList' = 'IPPList'
 const IPP_LIST_FHIR = 'identifier-simple'
 
-const RESSOURCE_TYPE_PATIENT: 'Patient' = 'Patient'
+export const RESSOURCE_TYPE_PATIENT: 'Patient' = 'Patient'
 const PATIENT_GENDER = 'gender' // ok
 const PATIENT_BIRTHDATE = 'age-day' // ok
 const PATIENT_DECEASED = 'deceased' // ok
@@ -38,15 +38,15 @@ const ENCOUNTER_DESTINATION = 'destination' // ok
 const ENCOUNTER_PROVENANCE = 'provenance' // ok
 const ENCOUNTER_ADMISSION = 'reason-code' // ok
 
-const RESSOURCE_TYPE_CLAIM: 'Claim' = 'Claim'
+export const RESSOURCE_TYPE_CLAIM: 'Claim' = 'Claim'
 const CLAIM_CODE = 'codeList' // ok
 const CLAIM_CODE_ALL_HIERARCHY = 'code'
 
-const RESSOURCE_TYPE_PROCEDURE: 'Procedure' = 'Procedure'
+export const RESSOURCE_TYPE_PROCEDURE: 'Procedure' = 'Procedure'
 const PROCEDURE_CODE = 'codeList' // ok
 const PROCEDURE_CODE_ALL_HIERARCHY = 'code'
 
-const RESSOURCE_TYPE_CONDITION: 'Condition' = 'Condition' // ok
+export const RESSOURCE_TYPE_CONDITION: 'Condition' = 'Condition' // ok
 const CONDITION_CODE = 'codeList' // ok
 const CONDITION_CODE_ALL_HIERARCHY = 'code'
 const CONDITION_TYPE = 'type' // ok
@@ -68,6 +68,11 @@ const RESSOURCE_TYPE_OBSERVATION: 'Observation' = 'Observation'
 const OBSERVATION_CODE = 'part-of'
 const OBSERVATION_CODE_ALL_HIERARCHY = 'code'
 const OBSERVATION_VALUE = 'value-quantity-value'
+const ENCOUNTER_SERVICE_PROVIDER = 'encounter.service-provider'
+const SERVICE_PROVIDER = 'service-provider'
+
+export const UNITE_EXECUTRICE = 'Unité exécutrice'
+export const STRUCTURE_HOSPITALIERE_DE_PRIS_EN_CHARGE = 'Structure hospitalière de prise en charge'
 
 const DEFAULT_CRITERIA_ERROR: SelectedCriteriaType = {
   id: 0,
@@ -321,6 +326,13 @@ const constructFilterFhir = (criterion: SelectedCriteriaType) => {
                 .reduce(searchReducer)}`
             : ''
         }`,
+        `${
+          criterion.encounterService && criterion.encounterService.length > 0
+            ? `${SERVICE_PROVIDER}=${criterion.encounterService
+                .map((encounterServiceItem: any) => encounterServiceItem.id)
+                .reduce(searchReducer)}`
+            : ''
+        }`,
         `${lengthFilter ? `${lengthFilter}` : ''}`,
         `${ageFilter ? `${ageFilter}` : ''}`
       ].filter((elem) => elem)
@@ -349,6 +361,13 @@ const constructFilterFhir = (criterion: SelectedCriteriaType) => {
           criterion.docType && criterion.docType.length > 0
             ? `${COMPOSITION_TYPE}=${criterion.docType.map((docType: DocType) => docType.code).reduce(searchReducer)}`
             : ''
+        }`,
+        `${
+          criterion.encounterService && criterion.encounterService.length > 0
+            ? `${ENCOUNTER_SERVICE_PROVIDER}=${criterion.encounterService
+                .map((encounterServiceItem: any) => encounterServiceItem.id)
+                .reduce(searchReducer)}`
+            : ''
         }`
       ]
         .filter((elem) => elem)
@@ -372,6 +391,13 @@ const constructFilterFhir = (criterion: SelectedCriteriaType) => {
                 .map((diagnosticType: any) => diagnosticType.id)
                 .reduce(searchReducer)}`
             : ''
+        }`,
+        `${
+          criterion.encounterService && criterion.encounterService.length > 0
+            ? `${ENCOUNTER_SERVICE_PROVIDER}=${criterion.encounterService
+                .map((encounterServiceItem: any) => encounterServiceItem.id)
+                .reduce(searchReducer)}`
+            : ''
         }`
       ]
         .filter((elem) => elem)
@@ -390,6 +416,13 @@ const constructFilterFhir = (criterion: SelectedCriteriaType) => {
                   .map((diagnosticType: any) => diagnosticType.id)
                   .reduce(searchReducer)}`
             : ''
+        }`,
+        `${
+          criterion.encounterService && criterion.encounterService.length > 0
+            ? `${ENCOUNTER_SERVICE_PROVIDER}=${criterion.encounterService
+                .map((encounterServiceItem: any) => encounterServiceItem.id)
+                .reduce(searchReducer)}`
+            : ''
         }`
       ]
         .filter((elem) => elem)
@@ -406,6 +439,13 @@ const constructFilterFhir = (criterion: SelectedCriteriaType) => {
               ? `${CLAIM_CODE_ALL_HIERARCHY}=*`
               : `${CLAIM_CODE}=${criterion.code.map((diagnosticType: any) => diagnosticType.id).reduce(searchReducer)}`
             : ''
+        }`,
+        `${
+          criterion.encounterService && criterion.encounterService.length > 0
+            ? `${ENCOUNTER_SERVICE_PROVIDER}=${criterion.encounterService
+                .map((encounterServiceItem: any) => encounterServiceItem.id)
+                .reduce(searchReducer)}`
+            : ''
         }`
       ]
         .filter((elem) => elem)
@@ -441,6 +481,13 @@ const constructFilterFhir = (criterion: SelectedCriteriaType) => {
                 .map((administration: any) => administration.id)
                 .reduce(searchReducer)}`
             : ''
+        }`,
+        `${
+          criterion.encounterService && criterion.encounterService.length > 0
+            ? `${ENCOUNTER_SERVICE_PROVIDER}=${criterion.encounterService
+                .map((encounterServiceItem: any) => encounterServiceItem.id)
+                .reduce(searchReducer)}`
+            : ''
         }`
       ]
         .filter((elem) => elem)
@@ -484,6 +531,13 @@ const constructFilterFhir = (criterion: SelectedCriteriaType) => {
                   .reduce(searchReducer)}`
             : ''
         }`,
+        `${
+          criterion.encounterService && criterion.encounterService.length > 0
+            ? `${ENCOUNTER_SERVICE_PROVIDER}=${criterion.encounterService
+                .map((encounterServiceItem: any) => encounterServiceItem.id)
+                .reduce(searchReducer)}`
+            : ''
+        }`,
         `${
           criterion.isLeaf &&
           criterion.code &&
@@ -1012,6 +1066,16 @@ export async function unbuildRequest(_json: string) {
               }
               case 'patient.active':
                 break
+              case SERVICE_PROVIDER: {
+                if (!value) continue
+
+                const updatedEncounterServices: ScopeTreeRow[] = await services.perimeters.getScopesWithSubItems(value)
+
+                currentCriterion.encounterService = currentCriterion.encounterService
+                  ? [...currentCriterion.encounterService, ...updatedEncounterServices]
+                  : updatedEncounterServices
+                break
+              }
               default:
                 currentCriterion.error = true
                 break
@@ -1078,6 +1142,16 @@ export async function unbuildRequest(_json: string) {
                   : newDocTypeIds
                 break
               }
+              case ENCOUNTER_SERVICE_PROVIDER: {
+                if (!value) continue
+
+                const updatedEncounterServices: ScopeTreeRow[] = await services.perimeters.getScopesWithSubItems(value)
+
+                currentCriterion.encounterService = currentCriterion.encounterService
+                  ? [...currentCriterion.encounterService, ...updatedEncounterServices]
+                  : updatedEncounterServices
+                break
+              }
               case 'patient.active':
               case 'status':
               case 'type:not':
@@ -1140,8 +1214,20 @@ export async function unbuildRequest(_json: string) {
                   : newDiagnosticType
                 break
               }
+              case ENCOUNTER_SERVICE_PROVIDER: {
+                if (!value) continue
+
+                const updatedEncounterServices: ScopeTreeRow[] = await services.perimeters.getScopesWithSubItems(value)
+
+                currentCriterion.encounterService = currentCriterion.encounterService
+                  ? [...currentCriterion.encounterService, ...updatedEncounterServices]
+                  : updatedEncounterServices
+                break
+              }
+
               case 'patient.active':
                 break
+
               default:
                 currentCriterion.error = true
                 break
@@ -1189,6 +1275,17 @@ export async function unbuildRequest(_json: string) {
                 currentCriterion.code = currentCriterion.code ? [...currentCriterion.code, ...newCode] : newCode
                 break
               }
+              case ENCOUNTER_SERVICE_PROVIDER: {
+                if (!value) continue
+
+                const updatedEncounterServices: ScopeTreeRow[] = await services.perimeters.getScopesWithSubItems(value)
+
+                currentCriterion.encounterService = currentCriterion.encounterService
+                  ? [...currentCriterion.encounterService, ...updatedEncounterServices]
+                  : updatedEncounterServices
+
+                break
+              }
               case 'patient.active':
                 break
               default:
@@ -1237,6 +1334,16 @@ export async function unbuildRequest(_json: string) {
                 currentCriterion.code = currentCriterion.code ? [...currentCriterion.code, ...newCode] : newCode
                 break
               }
+              case ENCOUNTER_SERVICE_PROVIDER: {
+                if (!value) continue
+
+                const updatedEncounterServices: ScopeTreeRow[] = await services.perimeters.getScopesWithSubItems(value)
+
+                currentCriterion.encounterService = currentCriterion.encounterService
+                  ? [...currentCriterion.encounterService, ...updatedEncounterServices]
+                  : updatedEncounterServices
+                break
+              }
               case 'patient.active':
                 break
               default:
@@ -1313,6 +1420,16 @@ export async function unbuildRequest(_json: string) {
               }
               case 'patient.active':
                 break
+              case ENCOUNTER_SERVICE_PROVIDER: {
+                if (!value) continue
+
+                const updatedEncounterServices: ScopeTreeRow[] = await services.perimeters.getScopesWithSubItems(value)
+
+                currentCriterion.encounterService = currentCriterion.encounterService
+                  ? [...currentCriterion.encounterService, ...updatedEncounterServices]
+                  : updatedEncounterServices
+                break
+              }
               default:
                 currentCriterion.error = true
                 break
@@ -1417,6 +1534,18 @@ export async function unbuildRequest(_json: string) {
 
                 break
               }
+
+              case ENCOUNTER_SERVICE_PROVIDER: {
+                if (!value) continue
+
+                const updatedEncounterServices: ScopeTreeRow[] = await services.perimeters.getScopesWithSubItems(value)
+
+                currentCriterion.encounterService = currentCriterion.encounterService
+                  ? [...currentCriterion.encounterService, ...updatedEncounterServices]
+                  : updatedEncounterServices
+
+                break
+              }
               case 'patient.active':
                 break
               default:
diff --git a/src/views/Welcome/Welcome.tsx b/src/views/Welcome/Welcome.tsx
index f32a7292c..e74197c8b 100644
--- a/src/views/Welcome/Welcome.tsx
+++ b/src/views/Welcome/Welcome.tsx
@@ -78,7 +78,7 @@ const Welcome: React.FC = () => {
     dispatch(initBiologyHierarchy())
 
     // fetchScope
-    dispatch(fetchScopesList())
+    dispatch(fetchScopesList({}))
   }, [])
 
   useEffect(() => {