diff --git a/packages/app-builder/src/components/ContinuousScreening/ConfigurationPanel.tsx b/packages/app-builder/src/components/ContinuousScreening/ConfigurationPanel.tsx
index dc2f3e6db..d57848cdd 100644
--- a/packages/app-builder/src/components/ContinuousScreening/ConfigurationPanel.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/ConfigurationPanel.tsx
@@ -14,6 +14,7 @@ import {
   PartialCreateContinuousScreeningConfig,
 } from './context/CreationStepper';
 import { FormPagination } from './context/FormPagination';
+import { ListAndTopicDatasetConfigurationBridge } from './context/ListAndTopicDatasetConfigurationBridge';
 import { Stepper } from './form/Stepper';
 import { DatasetSelection } from './form/steps/DatasetSelection';
 import { GeneralInfo } from './form/steps/GeneralInfo';
@@ -53,16 +54,18 @@ export const ConfigurationPanel = ({
   return (
     <PanelContainer size="max" className="p-0 bg-surface-page overflow-y-auto flex flex-col">
       <ContinuousScreeningConfigurationStepper.Provider value={configurationStepper}>
-        <ConfigurationPanelHeader />
-        <div className="p-v2-lg grow">
-          {match(configurationStepper.value.__internals.currentStep)
-            .with(0, () => <GeneralInfo stableId={baseConfig.stableId} />)
-            .with(1, () => <ObjectMapping baseConfig={baseConfig} />)
-            .with(2, () => <ScoringConfiguration />)
-            .with(3, () => <DatasetSelection />)
-            .otherwise(() => null)}
-        </div>
-        <FormPagination finalButtonText={t('continuousScreening:edition.validate_button')} />
+        <ListAndTopicDatasetConfigurationBridge>
+          <ConfigurationPanelHeader />
+          <div className="p-v2-lg grow">
+            {match(configurationStepper.value.__internals.currentStep)
+              .with(0, () => <GeneralInfo stableId={baseConfig.stableId} />)
+              .with(1, () => <ObjectMapping baseConfig={baseConfig} />)
+              .with(2, () => <DatasetSelection useCase="continuous_monitoring" />)
+              .with(3, () => <ScoringConfiguration />)
+              .otherwise(() => null)}
+          </div>
+          <FormPagination finalButtonText={t('continuousScreening:edition.validate_button')} />
+        </ListAndTopicDatasetConfigurationBridge>
       </ContinuousScreeningConfigurationStepper.Provider>
     </PanelContainer>
   );
diff --git a/packages/app-builder/src/components/ContinuousScreening/ConfigurationsPage.tsx b/packages/app-builder/src/components/ContinuousScreening/ConfigurationsPage.tsx
index d6b9ecbb9..f3eed7f9b 100644
--- a/packages/app-builder/src/components/ContinuousScreening/ConfigurationsPage.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/ConfigurationsPage.tsx
@@ -8,21 +8,24 @@ import QueryString from 'qs';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { match } from 'ts-pattern';
-import { Button } from 'ui-design-system';
+import { Button, Tag } from 'ui-design-system';
 import { Icon } from 'ui-icons';
+import { CopyToClipboardButton } from '../CopyToClipboardButton';
 import GridTable from '../GridTable';
 import { Page } from '../Page';
 import { PanelRoot } from '../Panel/Panel';
 import { Spinner } from '../Spinner';
 import { ConfigurationPanel } from './ConfigurationPanel';
-import { CopyToClipboardChip } from './CopyToClipboardChip';
 import { CreationModal } from './CreationModal';
 import { PartialCreateContinuousScreeningConfig } from './context/CreationStepper';
 import { EditionValidationPanel } from './EditionValidationPanel';
-import { Capsule } from './shared/Capsule';
 
 const CellCapsule = ({ children }: { children: React.ReactNode }) => {
-  return <Capsule className="max-w-50 truncate">{children}</Capsule>;
+  return (
+    <Tag color="grey" className="max-w-50 truncate">
+      {children}
+    </Tag>
+  );
 };
 
 export const ConfigurationsPage = ({ canEdit }: { canEdit: boolean }) => {
@@ -125,7 +128,9 @@ export const ConfigurationsPage = ({ canEdit }: { canEdit: boolean }) => {
                     >
                       <GridTable.Cell className="flex gap-v2-md items-center justify-between">
                         <span className="truncate">{item.name}</span>
-                        <CopyToClipboardChip value={item.stableId} className="min-w-40" />
+                        <CopyToClipboardButton toCopy={item.stableId} className="min-w-40" size="chip" rounded>
+                          <span className="text-xs">{item.stableId}</span>
+                        </CopyToClipboardButton>
                       </GridTable.Cell>
                       <GridTable.Cell>
                         {item.datasets[0] ? <CellCapsule>{item.datasets[0]}</CellCapsule> : null}
diff --git a/packages/app-builder/src/components/ContinuousScreening/CopyToClipboardChip.tsx b/packages/app-builder/src/components/ContinuousScreening/CopyToClipboardChip.tsx
index 5f2ee7001..3095a0a05 100644
--- a/packages/app-builder/src/components/ContinuousScreening/CopyToClipboardChip.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/CopyToClipboardChip.tsx
@@ -1,7 +1,9 @@
 import { useGetCopyToClipboard } from '@app-builder/utils/use-get-copy-to-clipboard';
 import { cn } from 'ui-design-system';
 import { Icon } from 'ui-icons';
-
+/**
+ * @deprecated use CopyToClipboardButton instead (with size = chip and rounded = true)
+ */
 export const CopyToClipboardChip = ({
   value,
   className,
diff --git a/packages/app-builder/src/components/ContinuousScreening/CreationPage.tsx b/packages/app-builder/src/components/ContinuousScreening/CreationPage.tsx
index eb9800cd5..de47210e6 100644
--- a/packages/app-builder/src/components/ContinuousScreening/CreationPage.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/CreationPage.tsx
@@ -7,6 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { BreadCrumbs } from '../Breadcrumbs';
 import { Page } from '../Page';
 import { ContinuousScreeningConfigurationStepper } from './context/CreationStepper';
+import { ListAndTopicDatasetConfigurationBridge } from './context/ListAndTopicDatasetConfigurationBridge';
 import { CreationContent } from './form/Content';
 import { Stepper } from './form/Stepper';
 
@@ -42,17 +43,19 @@ export const CreationPage = ({ name, description }: { name: string; description:
 
   return (
     <ContinuousScreeningConfigurationStepper.Provider value={creationStepper}>
-      <Page.Main>
-        <Page.Header className="justify-between">
-          <BreadCrumbs />
-          <Stepper fromZero getStepLabel={(stepName) => t(`continuousScreening:creation.stepper.${stepName}`)} />
-        </Page.Header>
-        <Page.Container>
-          <Page.ContentV2 paddingLess>
-            <CreationContent />
-          </Page.ContentV2>
-        </Page.Container>
-      </Page.Main>
+      <ListAndTopicDatasetConfigurationBridge>
+        <Page.Main>
+          <Page.Header className="justify-between">
+            <BreadCrumbs />
+            <Stepper fromZero getStepLabel={(stepName) => t(`continuousScreening:creation.stepper.${stepName}`)} />
+          </Page.Header>
+          <Page.Container>
+            <Page.ContentV2 paddingLess>
+              <CreationContent />
+            </Page.ContentV2>
+          </Page.Container>
+        </Page.Main>
+      </ListAndTopicDatasetConfigurationBridge>
     </ContinuousScreeningConfigurationStepper.Provider>
   );
 };
diff --git a/packages/app-builder/src/components/ContinuousScreening/context/CreationStepper.tsx b/packages/app-builder/src/components/ContinuousScreening/context/CreationStepper.tsx
index 59ca8665d..d8bdd3869 100644
--- a/packages/app-builder/src/components/ContinuousScreening/context/CreationStepper.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/context/CreationStepper.tsx
@@ -73,8 +73,8 @@ export const ContinuousScreeningConfigurationStepper = buildStepper({
   steps: [
     { name: 'generalInfo', schema: generalInfoStepSchema },
     { name: 'objectMapping', schema: objectMappingStepSchema },
-    { name: 'scoringConfiguration', schema: scoringConfigurationStepSchema },
     { name: 'datasetSelection', schema: datasetSelectionStepSchema },
+    { name: 'scoringConfiguration', schema: scoringConfigurationStepSchema },
   ] as const,
   validator: createContinuousScreeningConfigSchema,
 });
diff --git a/packages/app-builder/src/components/ContinuousScreening/context/ListAndTopicDatasetConfigurationBridge.tsx b/packages/app-builder/src/components/ContinuousScreening/context/ListAndTopicDatasetConfigurationBridge.tsx
new file mode 100644
index 000000000..01f8b3036
--- /dev/null
+++ b/packages/app-builder/src/components/ContinuousScreening/context/ListAndTopicDatasetConfigurationBridge.tsx
@@ -0,0 +1,25 @@
+import { ListAndTopicDatasetConfiguration } from '@app-builder/components/ListAndTopicConfiguration';
+import { type ReactNode, useEffect } from 'react';
+import { ContinuousScreeningConfigurationStepper } from './CreationStepper';
+
+/* 
+  this component is used to bridge the ListAndTopicDatasetConfiguration context with the ContinuousScreeningConfigurationStepper context
+  to ensure that the datasets map is updated when the wizard mode changes
+*/
+export function ListAndTopicDatasetConfigurationBridge({ children }: { children: ReactNode }) {
+  const wizard = ContinuousScreeningConfigurationStepper.useSharp();
+  const wizardMode = ContinuousScreeningConfigurationStepper.select((s) => s.__internals.mode);
+  const datasetsMap = wizard.value.data.datasets;
+  const listSharp = ListAndTopicDatasetConfiguration.createSharp({
+    datasets: datasetsMap,
+    mode: wizardMode,
+  });
+
+  useEffect(() => {
+    listSharp.actions.setMode(wizardMode);
+  }, [listSharp, wizardMode]);
+
+  return (
+    <ListAndTopicDatasetConfiguration.Provider value={listSharp}>{children}</ListAndTopicDatasetConfiguration.Provider>
+  );
+}
diff --git a/packages/app-builder/src/components/ContinuousScreening/form/Content.tsx b/packages/app-builder/src/components/ContinuousScreening/form/Content.tsx
index 9e1f6af1a..443d9a91b 100644
--- a/packages/app-builder/src/components/ContinuousScreening/form/Content.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/form/Content.tsx
@@ -19,8 +19,8 @@ export const CreationContent = () => {
       <div className="grow p-v2-lg pb-0 flex flex-col gap-v2-md">
         {match(creationStepper.computed.currentStep.value)
           .with(1, () => <ObjectMapping />)
-          .with(2, () => <ScoringConfiguration />)
-          .with(3, () => <DatasetSelection />)
+          .with(2, () => <DatasetSelection useCase="continuous_monitoring" />)
+          .with(3, () => <ScoringConfiguration />)
           .otherwise(() => null)}
         <CreationContentRecap />
       </div>
@@ -42,8 +42,8 @@ const CreationContentRecap = () => {
       })}
     >
       {currentStep >= 1 ? <ObjectMappingRecap /> : null}
-      {currentStep >= 2 ? <ScoringConfigurationRecap /> : null}
-      {currentStep >= 3 ? <DatasetSelectionRecap /> : null}
+      {currentStep >= 2 ? <DatasetSelectionRecap /> : null}
+      {currentStep >= 3 ? <ScoringConfigurationRecap /> : null}
     </div>
   );
 };
diff --git a/packages/app-builder/src/components/ContinuousScreening/form/recaps/DatasetSelectionRecap.tsx b/packages/app-builder/src/components/ContinuousScreening/form/recaps/DatasetSelectionRecap.tsx
index f691d5a49..8301044d7 100644
--- a/packages/app-builder/src/components/ContinuousScreening/form/recaps/DatasetSelectionRecap.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/form/recaps/DatasetSelectionRecap.tsx
@@ -1,59 +1,38 @@
-import { useScreeningDatasetsQuery } from '@app-builder/queries/screening/datasets';
-import { OpenSanctionsCatalogSection } from 'marble-api';
+import { getSectionLeafNames } from '@app-builder/components/ListAndTopicConfiguration';
+import { SCREENING_CATEGORY_I18N_KEY_MAP, type ScreeningCategory } from '@app-builder/models/screening';
+import { type ListConfigFilters, useListConfigQuery } from '@app-builder/queries/screening/lists-config';
 import { useTranslation } from 'react-i18next';
-import { match } from 'ts-pattern';
 import { ContinuousScreeningConfigurationStepper } from '../../context/CreationStepper';
 import { RecapCapsule, RecapRow } from '../../shared/RecapRow';
 
-const calculateSelectedCountByTags = (sections: OpenSanctionsCatalogSection[], selectedDatasets: string[]) => {
-  const flatDatasets = sections.flatMap((section) => section.datasets);
-  const selectedCountByTags: Record<string, number> = {};
-
-  selectedDatasets.forEach((datasetName) => {
-    const dataset = flatDatasets.find((d) => d.name === datasetName);
-    if (dataset) {
-      const datasetTag = dataset.tag ? dataset.tag : 'unknown';
-      selectedCountByTags[datasetTag] = (selectedCountByTags[datasetTag] ?? 0) + 1;
-    }
-  });
-
-  return selectedCountByTags;
-};
+type SectionData = NonNullable<ListConfigFilters[keyof ListConfigFilters]>;
 
 export const DatasetSelectionRecap = () => {
   const { t } = useTranslation(['continuousScreening', 'scenarios']);
-  const datasetsQuery = useScreeningDatasetsQuery();
-  const selectedDatasets = ContinuousScreeningConfigurationStepper.select((state) =>
-    Object.keys(state.data.datasets).filter((k) => !!state.data.datasets[k]),
-  );
+  const listConfigQuery = useListConfigQuery('continuous_monitoring');
+  const datasets = ContinuousScreeningConfigurationStepper.select((state) => state.data.datasets);
+
+  const enabledSections = Object.entries(listConfigQuery.data ?? {}).filter(
+    ([key, section]) => !!datasets[key] && section != null,
+  ) as [ScreeningCategory, SectionData][];
 
   return (
     <RecapRow>
-      <span>{t('continuousScreening:creation.datasetSelection.recap.title', { count: selectedDatasets.length })}</span>
-      {match(datasetsQuery)
-        .with({ isPending: true }, () => <div>Loading...</div>)
-        .with({ isError: true }, () => <div>Error</div>)
-        .with({ isSuccess: true }, ({ data }) => {
-          const selectedCountByTags = calculateSelectedCountByTags(data.datasets.sections, selectedDatasets);
-          const entries = Object.entries(selectedCountByTags);
-
-          return (
-            <div className="flex flex-row items-center gap-v2-xs">
-              {entries.map(([tag, count]) => (
-                <RecapCapsule key={tag}>
-                  {count}{' '}
-                  {match(tag)
-                    .with('peps', () => t(`scenarios:sanction.lists.peps`))
-                    .with('third-parties', () => t(`scenarios:sanction.lists.third_parties`))
-                    .with('sanctions', () => t(`scenarios:sanction.lists.sanctions`))
-                    .with('adverse-media', () => t(`scenarios:sanction.lists.adverse_media`))
-                    .otherwise(() => t(`scenarios:sanction.lists.other`))}
-                </RecapCapsule>
-              ))}
-            </div>
-          );
-        })
-        .exhaustive()}
+      <span>{t('continuousScreening:creation.datasetSelection.recap.title', { count: enabledSections.length })}</span>
+      {enabledSections.map(([key, section]) => {
+        const leafCount = getSectionLeafNames(section).filter((n) => !!datasets[n]).length;
+        const sectionLabel = t(`scenarios:sanction.lists.${SCREENING_CATEGORY_I18N_KEY_MAP[key]}`);
+        return (
+          <RecapCapsule key={key}>
+            <span className="flex flex-row items-center gap-v2-xs">
+              <span>{sectionLabel}</span>
+              <span>
+                {t('continuousScreening:creation.datasetSelection.recap.section_items', { count: leafCount })}
+              </span>
+            </span>
+          </RecapCapsule>
+        );
+      })}
     </RecapRow>
   );
 };
diff --git a/packages/app-builder/src/components/ContinuousScreening/form/steps/DatasetSelection.tsx b/packages/app-builder/src/components/ContinuousScreening/form/steps/DatasetSelection.tsx
index ec4d9eb93..a83ba2d49 100644
--- a/packages/app-builder/src/components/ContinuousScreening/form/steps/DatasetSelection.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/form/steps/DatasetSelection.tsx
@@ -1,22 +1,14 @@
 import { Callout } from '@app-builder/components/Callout';
-import { DatasetTag } from '@app-builder/components/Screenings/DatasetTag';
-import { Spinner } from '@app-builder/components/Spinner';
-import { ScreeningCategory } from '@app-builder/models/screening';
-import { useScreeningDatasetsQuery } from '@app-builder/queries/screening/datasets';
-import { useCallbackRef } from '@marble/shared';
-import * as Collapsible from '@radix-ui/react-collapsible';
-import { OpenSanctionsCatalogDataset, OpenSanctionsCatalogSection } from 'marble-api';
-import { MouseEvent, useState } from 'react';
+import {
+  DatasetSelectionContent,
+  ListAndTopicDatasetConfiguration,
+} from '@app-builder/components/ListAndTopicConfiguration';
+import { type AvailableFeatures } from '@app-builder/models/screening';
 import { useTranslation } from 'react-i18next';
-import { match } from 'ts-pattern';
-import { Button, Checkbox } from 'ui-design-system';
-import { Icon } from 'ui-icons';
-import { ContinuousScreeningConfigurationStepper } from '../../context/CreationStepper';
 
-export const DatasetSelection = () => {
+export const DatasetSelection = ({ useCase }: { useCase: AvailableFeatures }) => {
   const { t } = useTranslation(['common', 'continuousScreening']);
-  const datasetsQuery = useScreeningDatasetsQuery();
-  const mode = ContinuousScreeningConfigurationStepper.select((state) => state.__internals.mode);
+  const mode = ListAndTopicDatasetConfiguration.select((state) => state.mode);
   const tKey = mode === 'view' ? 'view' : 'creation';
 
   return (
@@ -25,124 +17,8 @@ export const DatasetSelection = () => {
         {t(`continuousScreening:${tKey}.datasetSelection.callout`)}
       </Callout>
       <div className="bg-surface-card rounded-v2-lg border border-grey-border">
-        <div className="border-b border-grey-border p-v2-md flex justify-between items-center">
-          <span className="text-s font-semibold">{t('continuousScreening:creation.datasetSelection.list.title')}</span>
-          <SelectedListsCount />
-        </div>
-        <div className="p-v2-md overflow-y-auto">
-          {match(datasetsQuery)
-            .with({ isPending: true }, () => (
-              <div className="flex items-center justify-center h-50">
-                <Spinner className="size-10" />
-              </div>
-            ))
-            .with({ isError: true }, () => (
-              <div className="flex flex-col gap-v2-md items-center justify-center h-50">
-                <div className="">{t('common:generic_fetch_data_error')}</div>
-                <Button variant="secondary" onClick={() => datasetsQuery.refetch()}>
-                  {t('common:retry')}
-                </Button>
-              </div>
-            ))
-            .with({ isSuccess: true }, ({ data }) => {
-              return (
-                <div className="flex flex-col gap-v2-md">
-                  {data.datasets.sections.map((datasetSection) => (
-                    <DatasetSection key={datasetSection.name} section={datasetSection} />
-                  ))}
-                </div>
-              );
-            })
-            .exhaustive()}
-        </div>
+        <DatasetSelectionContent useCase={useCase} />
       </div>
     </div>
   );
 };
-
-const SelectedListsCount = () => {
-  const { t } = useTranslation(['continuousScreening']);
-  const selectedDatasetsCount = ContinuousScreeningConfigurationStepper.select(
-    (state) => Object.values(state.data.datasets).filter(Boolean).length,
-  );
-  return <span>{t('continuousScreening:creation.datasetSelection.list.count', { count: selectedDatasetsCount })}</span>;
-};
-
-const DatasetSection = ({ section }: { section: OpenSanctionsCatalogSection }) => {
-  const [isExpanded, setIsExpanded] = useState(false);
-
-  return (
-    <Collapsible.Root className="flex flex-col gap-v2-sm group/collapsible">
-      <Collapsible.Trigger asChild>
-        <span className="text-s flex items-center justify-between" onClick={() => setIsExpanded(!isExpanded)}>
-          <div className="flex gap-v2-md items-center">
-            <Icon
-              icon="caret-down"
-              className="size-4 shrink-0 group-radix-state-open/collapsible:rotate-180 transition-transform duration-200"
-            />
-            <span className="font-semibold">{section.title}</span>
-          </div>
-          <SelectAllCheckbox section={section} />
-        </span>
-      </Collapsible.Trigger>
-      <Collapsible.Content className="flex flex-col border border-grey-border rounded-v2-md overflow-hidden bg-surface-card radix-state-open:animate-slide-down radix-state-closed:animate-slide-up">
-        {section.datasets.map((dataset) => (
-          <DatasetItem key={dataset.name} dataset={dataset} />
-        ))}
-      </Collapsible.Content>
-    </Collapsible.Root>
-  );
-};
-
-const DatasetItem = ({ dataset }: { dataset: OpenSanctionsCatalogDataset }) => {
-  const creationStepper = ContinuousScreeningConfigurationStepper.useSharp();
-  const isSelected = ContinuousScreeningConfigurationStepper.select((state) => state.data.datasets[dataset.name]);
-  const handleChange = useCallbackRef(() => {
-    const stepperData = creationStepper.value.data;
-    stepperData.datasets[dataset.name] = !stepperData.datasets[dataset.name];
-  });
-  const mode = ContinuousScreeningConfigurationStepper.select((state) => state.__internals.mode);
-
-  return (
-    <div
-      className="flex flex-row items-center justify-between p-v2-md even:bg-grey-background-light"
-      onClick={handleChange}
-    >
-      <div className="flex flex-row items-center gap-v2-sm">
-        <Checkbox size="small" checked={isSelected} disabled={mode === 'view'} />
-        <span className="text-s">{dataset.title}</span>
-      </div>
-      {dataset.tag ? <DatasetTag category={dataset.tag as ScreeningCategory} /> : null}
-    </div>
-  );
-};
-
-const SelectAllCheckbox = ({ section }: { section: OpenSanctionsCatalogSection }) => {
-  const { t } = useTranslation(['continuousScreening']);
-  const creationStepper = ContinuousScreeningConfigurationStepper.useSharp();
-  const mode = ContinuousScreeningConfigurationStepper.select((state) => state.__internals.mode);
-  const selectedState = ContinuousScreeningConfigurationStepper.select((state) => {
-    const selectedCount = section.datasets.filter((dataset) => state.data.datasets[dataset.name]).length;
-    return selectedCount === section.datasets.length ? true : selectedCount === 0 ? false : 'indeterminate';
-  });
-  const handleClick = useCallbackRef((e: MouseEvent) => {
-    e.stopPropagation();
-    const nextState = selectedState === true ? false : true;
-    const datasetsNames = section.datasets.map((d) => d.name);
-
-    datasetsNames.forEach((datasetName) => {
-      creationStepper.value.data.datasets[datasetName] = nextState;
-    });
-  });
-
-  return (
-    <div className="flex items-center gap-v2-sm" onClick={handleClick}>
-      <Checkbox size="small" checked={selectedState} disabled={mode === 'view'} />
-      <span>
-        {t(
-          `continuousScreening:creation.datasetSelection.list.section.${selectedState === true ? 'unselect_all' : 'select_all'}`,
-        )}
-      </span>
-    </div>
-  );
-};
diff --git a/packages/app-builder/src/components/ContinuousScreening/form/steps/GeneralInfo.tsx b/packages/app-builder/src/components/ContinuousScreening/form/steps/GeneralInfo.tsx
index c00d086e5..7538873a2 100644
--- a/packages/app-builder/src/components/ContinuousScreening/form/steps/GeneralInfo.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/form/steps/GeneralInfo.tsx
@@ -1,6 +1,6 @@
+import { CopyToClipboardButton } from '@app-builder/components/CopyToClipboardButton';
 import { useTranslation } from 'react-i18next';
 import { Input, TextArea } from 'ui-design-system';
-import { CopyToClipboardChip } from '../../CopyToClipboardChip';
 import { ContinuousScreeningConfigurationStepper } from '../../context/CreationStepper';
 
 export const GeneralInfo = ({ stableId }: { stableId: string }) => {
@@ -14,7 +14,9 @@ export const GeneralInfo = ({ stableId }: { stableId: string }) => {
       <div className="grid grid-cols-[3fr_2fr] gap-v2-lg">
         <Input readOnly={mode === 'view'} value={name.value} onChange={(e) => (name.value = e.target.value)} />
         <div className="self-center">
-          <CopyToClipboardChip value={stableId} className="self-center text-xxs" />
+          <CopyToClipboardButton toCopy={stableId} size="chip" rounded>
+            <span className="text-xs">{stableId}</span>
+          </CopyToClipboardButton>
         </div>
       </div>
       <TextArea
diff --git a/packages/app-builder/src/components/ContinuousScreening/form/steps/ObjectMapping.tsx b/packages/app-builder/src/components/ContinuousScreening/form/steps/ObjectMapping.tsx
index 951978cf9..5bea51e26 100644
--- a/packages/app-builder/src/components/ContinuousScreening/form/steps/ObjectMapping.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/form/steps/ObjectMapping.tsx
@@ -1,5 +1,10 @@
 import { Callout } from '@app-builder/components/Callout';
-import { FTM_ENTITIES, FTM_ENTITIES_PROPERTIES } from '@app-builder/constants/ftm-entities';
+import {
+  FTM_ENTITIES,
+  FTM_ENTITIES_PROPERTIES,
+  FtmEntityPropertyKey,
+  getFtmEntitySuggestion,
+} from '@app-builder/constants/ftm-entities';
 import { ContinuousScreeningConfig } from '@app-builder/models/continuous-screening';
 import { TableModel } from '@app-builder/models/data-model';
 import { useDataModelQuery } from '@app-builder/queries/data/get-data-model';
@@ -194,6 +199,27 @@ const ObjectMappingFtmContent = ({
   const ftmEntity = table.ftmEntity ?? mappingConfig.ftmEntity;
   const availableProperties = ftmEntity ? FTM_ENTITIES_PROPERTIES[ftmEntity] : [];
 
+  const handleSuggest = () => {
+    if (!ftmEntity) return;
+
+    const updatedFieldMapping = { ...mappingConfig.fieldMapping };
+
+    for (const property of availableProperties) {
+      const key = `${ftmEntity}.${property}` as FtmEntityPropertyKey;
+      const suggestion = getFtmEntitySuggestion(key);
+      if (!suggestion) continue;
+
+      const field = table.fields.find(
+        (f) =>
+          f.semanticType === suggestion.semanticType &&
+          (suggestion.semanticSubType ? f.semanticSubType === suggestion.semanticSubType : true),
+      );
+      if (field && !field.ftmProperty) updatedFieldMapping[field.id] = property;
+    }
+
+    onUpdate({ ...mappingConfig, fieldMapping: updatedFieldMapping });
+  };
+
   return (
     <>
       <FTMEntitySelector
@@ -210,10 +236,15 @@ const ObjectMappingFtmContent = ({
       />
       {ftmEntity ? (
         <div className="flex flex-col gap-v2-sm border border-grey-border rounded-v2-lg bg-surface-card">
-          <div className="flex items-center justify-between p-v2-md border-b border-grey-border">
-            <div className="text-h3 font-semibold">
+          <div className="flex items-center gap-4 p-v2-md border-b border-grey-border">
+            <h3 className="text-h3 font-semibold">
               {t('continuousScreening:creation.objectMapping.configurator.fieldMapping.title')}
-            </div>
+            </h3>
+            {mode !== 'view' && (
+              <Button variant="primary" appearance="stroked" onClick={handleSuggest}>
+                {t('continuousScreening:creation.objectMapping.configurator.fieldMapping.suggest')}
+              </Button>
+            )}
           </div>
           <div className="grid grid-cols-[auto_40px_1fr] gap-v2-sm p-v2-md">
             {table.fields
@@ -310,7 +341,7 @@ const FtmFieldSelector = ({
 }: {
   ftmEntity: string;
   ftmProperty: string | null;
-  availableProperties: string[];
+  availableProperties: readonly string[];
   readOnly: boolean;
   onChange: (ftmProperty: string | null) => void;
 }) => {
diff --git a/packages/app-builder/src/components/ContinuousScreening/shared/Capsule.tsx b/packages/app-builder/src/components/ContinuousScreening/shared/Capsule.tsx
deleted file mode 100644
index 70e861bf4..000000000
--- a/packages/app-builder/src/components/ContinuousScreening/shared/Capsule.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ReactNode } from 'react';
-import { cn } from 'ui-design-system';
-
-type CapsuleProps = { children: ReactNode; className?: string };
-
-export const Capsule = ({ children, className }: CapsuleProps) => {
-  return (
-    <div className={cn('rounded-full px-v2-sm py-v2-xs text-small bg-grey-background', className)}>{children}</div>
-  );
-};
diff --git a/packages/app-builder/src/components/ContinuousScreening/shared/RecapRow.tsx b/packages/app-builder/src/components/ContinuousScreening/shared/RecapRow.tsx
index 50d2a169a..5e2ff9197 100644
--- a/packages/app-builder/src/components/ContinuousScreening/shared/RecapRow.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/shared/RecapRow.tsx
@@ -1,4 +1,4 @@
-import { Capsule } from './Capsule';
+import { Tag } from 'ui-design-system';
 
 export const RecapRow = ({ children }: { children: React.ReactNode }) => {
   return <div className="flex flex-row items-center gap-v2-xs h-[25px]">{children}</div>;
@@ -6,8 +6,11 @@ export const RecapRow = ({ children }: { children: React.ReactNode }) => {
 
 export const RecapCapsule = ({ children }: { children: React.ReactNode }) => {
   return (
-    <Capsule className="bg-grey-background [.group\/recap-valid_&]:bg-surface-card [.group\/recap-valid_&]:dark:border [.group\/recap-valid_&]:dark:border-green-primary">
+    <Tag
+      color="grey"
+      className="bg-grey-background [.group\/recap-valid_&]:bg-surface-card [.group\/recap-valid_&]:dark:border [.group\/recap-valid_&]:dark:border-green-primary"
+    >
       {children}
-    </Capsule>
+    </Tag>
   );
 };
diff --git a/packages/app-builder/src/components/ContinuousScreening/validation/DatasetSelectionSection.tsx b/packages/app-builder/src/components/ContinuousScreening/validation/DatasetSelectionSection.tsx
index 3b8f7f8d0..d980784f6 100644
--- a/packages/app-builder/src/components/ContinuousScreening/validation/DatasetSelectionSection.tsx
+++ b/packages/app-builder/src/components/ContinuousScreening/validation/DatasetSelectionSection.tsx
@@ -35,6 +35,7 @@ export const DatasetSelectionSection = ({ updatedConfig, baseConfig }: EditionVa
             </div>
           ))
           .with({ isSuccess: true }, ({ data: { datasets } }) => {
+            if (!datasets?.sections) return null;
             const datasetsArray = R.pipe(
               datasets.sections,
               R.flatMap(R.prop('datasets')),
diff --git a/packages/app-builder/src/components/CopyToClipboardButton.tsx b/packages/app-builder/src/components/CopyToClipboardButton.tsx
index 0ec8662ca..5e519e737 100644
--- a/packages/app-builder/src/components/CopyToClipboardButton.tsx
+++ b/packages/app-builder/src/components/CopyToClipboardButton.tsx
@@ -11,6 +11,7 @@ const variances = cva(
       size: {
         sm: 'p-0.5 gap-2',
         lg: 'min-h-8 gap-3 px-2',
+        chip: 'py-v2-xs px-v2-sm gap-v2-xs font-semibold text-small bg-surface-card',
       },
       dimmed: {
         true: 'text-grey-secondary',
@@ -48,7 +49,7 @@ export const CopyToClipboardButton = forwardRef<HTMLButtonElement, CopyToClipboa
         <Icon
           icon="copy"
           className={cn('shrink-0 text-current', {
-            'size-4': size === undefined || size === 'lg',
+            'size-4': size === undefined || size === 'lg' || size === 'chip',
             'size-3': size === 'sm',
           })}
         />
diff --git a/packages/app-builder/src/components/ListAndTopicConfiguration/DatasetSelectionContent.tsx b/packages/app-builder/src/components/ListAndTopicConfiguration/DatasetSelectionContent.tsx
new file mode 100644
index 000000000..840496ae9
--- /dev/null
+++ b/packages/app-builder/src/components/ListAndTopicConfiguration/DatasetSelectionContent.tsx
@@ -0,0 +1,653 @@
+import { DatasetTag } from '@app-builder/components/Screenings/DatasetTag';
+import { Spinner } from '@app-builder/components/Spinner';
+import { type AvailableFeatures, type ScreeningCategory } from '@app-builder/models/screening';
+import { useListConfigQuery } from '@app-builder/queries/screening/lists-config';
+import { UseQueryResult } from '@tanstack/react-query';
+import { useLayoutEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { capitalize } from 'remeda';
+import { match } from 'ts-pattern';
+import { Button, Checkbox, type CheckedState, Collapsible, cn, MenuCommand, ScrollAreaV2, Tag } from 'ui-design-system';
+import { Icon } from 'ui-icons';
+import { ListAndTopicDatasetConfiguration } from './context/ListAndTopicDatasetConfiguration';
+import { getSectionLeafNames } from './dataset-utils';
+
+type ListConfig = NonNullable<Awaited<ReturnType<typeof useListConfigQuery>>['data']>;
+type SectionData = NonNullable<ListConfig[keyof ListConfig]>;
+
+function groupCheckState(names: string[], datasetsMap: Record<string, boolean>): CheckedState {
+  if (names.length === 0) return false;
+  const selected = names.filter((n) => datasetsMap[n]).length;
+  if (selected === 0) return false;
+  if (selected === names.length) return true;
+  return 'indeterminate';
+}
+
+export function DatasetSelectionContent({ useCase }: { useCase: AvailableFeatures }) {
+  const listConfigQuery = useListConfigQuery(useCase);
+  const { t } = useTranslation(['common', 'continuousScreening']);
+
+  return (
+    <>
+      <div className="border-b border-grey-border p-v2-md flex justify-between items-center">
+        <span className="text-s font-semibold">{t('continuousScreening:creation.datasetSelection.list.title')}</span>
+        <SelectedListsCount listConfigQuery={listConfigQuery} />
+      </div>
+      <ScrollAreaV2 className="p-v2-md" orientation="vertical">
+        {match(listConfigQuery)
+          .with({ isPending: true }, () => (
+            <div className="flex items-center justify-center h-50">
+              <Spinner className="size-10" />
+            </div>
+          ))
+          .with({ isError: true }, () => (
+            <div className="flex flex-col gap-v2-md items-center justify-center h-50">
+              <div className="">{t('common:generic_fetch_data_error')}</div>
+              <Button variant="secondary" onClick={() => listConfigQuery.refetch()}>
+                {t('common:retry')}
+              </Button>
+            </div>
+          ))
+          .with({ isSuccess: true }, ({ data }) => (
+            <div className="flex flex-col">
+              {data &&
+                Object.entries(data)
+                  .filter(([, section]) => section.datasets?.length || section.topics)
+                  .map(([key, section]) =>
+                    section ? <Section key={key} sectionKey={key as ScreeningCategory} section={section} /> : null,
+                  )}
+            </div>
+          ))
+          .exhaustive()}
+      </ScrollAreaV2>
+    </>
+  );
+}
+
+const SelectedListsCount = ({ listConfigQuery }: { listConfigQuery: UseQueryResult<ListConfig, Error> }) => {
+  const { t } = useTranslation(['continuousScreening']);
+  const datasets = ListAndTopicDatasetConfiguration.select((state) => state.datasets);
+  const sectionCount = Object.keys(listConfigQuery.data ?? {}).filter((k) => !!datasets[k]).length;
+  return <span>{t('continuousScreening:creation.datasetSelection.list.count', { count: sectionCount })}</span>;
+};
+
+const Section = ({ sectionKey, section }: { sectionKey: ScreeningCategory; section: SectionData }) => {
+  const listConfig = ListAndTopicDatasetConfiguration.useSharp();
+  const mode = ListAndTopicDatasetConfiguration.select((state) => state.mode);
+
+  const leafNames = getSectionLeafNames(section);
+  const isEnabled = ListAndTopicDatasetConfiguration.select((state) => !!state.datasets[sectionKey]);
+  const selectedCount = ListAndTopicDatasetConfiguration.select(
+    (state) => leafNames.filter((n) => state.datasets[n]).length,
+  );
+
+  return (
+    <Collapsible.Container className="border-none px-v2-md py-v2-sm h-fit" defaultOpen={false}>
+      <Collapsible.Title hideIcon asChild size="null">
+        <div className="flex items-center justify-between">
+          <div className="flex gap-v2-md items-center">
+            <span onClick={(e) => e.stopPropagation()} className="inline-flex">
+              <Checkbox
+                stopPropagation
+                size="small"
+                checked={isEnabled}
+                disabled={mode === 'view'}
+                onCheckedChange={() => {
+                  listConfig.update((state) => {
+                    const nextValue = !state.datasets[sectionKey];
+                    state.datasets[sectionKey] = nextValue;
+                  });
+                }}
+              />
+            </span>
+            <Icon
+              icon="caret-down"
+              className="size-4 shrink-0 transition-transform duration-200 group-radix-state-open:rotate-180"
+            />
+            <DatasetTag category={sectionKey} />
+          </div>
+          <span className="text-xs text-grey-50 pl-v2-md">
+            {selectedCount} / {leafNames.length}
+          </span>
+        </div>
+      </Collapsible.Title>
+      <Collapsible.Content className="flex flex-col overflow-hidden border-none bg-surface-card radix-state-open:animate-slide-down radix-state-closed:animate-slide-up">
+        <SectionContent sectionKey={sectionKey} section={section} />
+      </Collapsible.Content>
+    </Collapsible.Container>
+  );
+};
+
+const SectionContent = ({ sectionKey, section }: { sectionKey: ScreeningCategory; section: SectionData }) => {
+  const { datasets, topics, conditionalTopics } = section;
+  const listConfig = ListAndTopicDatasetConfiguration.useSharp();
+
+  if (!datasets?.length && !topics && !conditionalTopics) return null;
+
+  function makeResetHandler(dependsOnKey: string): (() => void) | undefined {
+    if (!conditionalTopics) return undefined;
+    const dependents = Object.values(conditionalTopics).filter((ct) => ct.dependsOn === dependsOnKey);
+    const dependsOnTopics = topics?.[dependsOnKey] ?? [];
+    if (dependents.length === 0) return undefined;
+    return () => {
+      const selectedPrefixes = dependsOnTopics.filter((t) => listConfig.value.datasets[t.name]).map((t) => t.name);
+      if (selectedPrefixes.length === 0) return;
+      listConfig.update((state) => {
+        for (const ct of dependents) {
+          for (const item of ct.items) {
+            const prefix = item.key.split('.')[0];
+            if (!selectedPrefixes.some((sel) => sel === prefix)) {
+              state.datasets[item.name] = false;
+            }
+          }
+        }
+      });
+    };
+  }
+
+  return (
+    <div className="flex flex-col">
+      {datasets?.map((group) => (
+        <ItemGroup key={group.name} title={group.title} items={group.datasets} sectionKey={sectionKey} />
+      ))}
+      {topics &&
+        Object.entries(topics).map(([key, items]) => (
+          <FilterGroupRow
+            key={key}
+            sectionKey={sectionKey}
+            groupKey={key}
+            items={items}
+            onAfterChange={makeResetHandler(key)}
+          />
+        ))}
+      {conditionalTopics &&
+        Object.entries(conditionalTopics).map(([name, { items, dependsOn }]) => (
+          <ConditionalFilterGroupRow
+            key={name}
+            sectionKey={sectionKey}
+            groupKey={name}
+            allItems={items}
+            dependsOnItems={section.topics?.[dependsOn]?.map((t) => t.name) ?? []}
+          />
+        ))}
+    </div>
+  );
+};
+
+const ItemGroup = ({
+  title,
+  items,
+  sectionKey,
+}: {
+  title: string;
+  items: { name: string; title?: string }[];
+  sectionKey: ScreeningCategory;
+}) => {
+  const { t } = useTranslation(['continuousScreening']);
+  const listConfig = ListAndTopicDatasetConfiguration.useSharp();
+  const mode = ListAndTopicDatasetConfiguration.select((state) => state.mode);
+  const names = items.map((i) => i.name);
+  const checkState = ListAndTopicDatasetConfiguration.select(
+    (state): CheckedState => groupCheckState(names, state.datasets),
+  );
+  const selectedCount = ListAndTopicDatasetConfiguration.select(
+    (state) => names.filter((n) => state.datasets[n]).length,
+  );
+
+  const handleSelectAll = () => {
+    const datasetsMap = listConfig.value.datasets;
+    const selected = names.filter((n) => datasetsMap[n]).length;
+    const nextValue = selected < names.length;
+    listConfig.update((state) => {
+      for (const name of names) {
+        state.datasets[name] = nextValue;
+      }
+      if (nextValue) {
+        state.datasets[sectionKey] = true;
+      }
+    });
+  };
+
+  return (
+    <Collapsible.Container className="border-none px-v2-md py-v2-sm h-fit" defaultOpen={false}>
+      <Collapsible.Title hideIcon asChild size="null">
+        <div className="flex items-center gap-v2-md justify-between w-full">
+          <span className="flex items-center gap-v2-md">
+            <Icon
+              icon="caret-down"
+              className="size-4 shrink-0 transition-transform duration-200 group-radix-state-open:rotate-180"
+            />
+            <span className="text-s font-semibold">{capitalize(title)}</span>
+            <span className="text-xs text-grey-secondary">
+              {selectedCount} / {names.length}
+            </span>
+          </span>
+          <span className="flex items-center gap-v2-md font-normal">
+            <span className="text-s text-grey-50">
+              {t(
+                `continuousScreening:creation.datasetSelection.list.section.${checkState === true ? 'unselect_all' : 'select_all'}`,
+              )}
+            </span>
+            <span onClick={(e) => e.stopPropagation()} className="inline-flex mr-6">
+              <Checkbox
+                size="small"
+                checked={checkState}
+                disabled={mode === 'view'}
+                onCheckedChange={handleSelectAll}
+                stopPropagation
+              />
+            </span>
+          </span>
+        </div>
+      </Collapsible.Title>
+      <Collapsible.Content className="flex flex-col overflow-hidden border-none bg-surface-card radix-state-open:animate-slide-down radix-state-closed:animate-slide-up">
+        <div className="flex flex-col gap-v2-sm pt-v2-sm">
+          <div className="flex flex-col border border-grey-border rounded-v2-md overflow-hidden">
+            {items.map((item) => (
+              <ItemRow key={item.name} name={item.name} label={item.title ?? item.name} sectionKey={sectionKey} />
+            ))}
+          </div>
+        </div>
+      </Collapsible.Content>
+    </Collapsible.Container>
+  );
+};
+
+const ItemRow = ({ name, label, sectionKey }: { name: string; label: string; sectionKey: ScreeningCategory }) => {
+  const listConfig = ListAndTopicDatasetConfiguration.useSharp();
+  const mode = ListAndTopicDatasetConfiguration.select((state) => state.mode);
+  const isSelected = ListAndTopicDatasetConfiguration.select((state) => !!state.datasets[name]);
+
+  const onClickItem = () => {
+    if (mode === 'view') return;
+    listConfig.update((state) => {
+      const nextValue = !state.datasets[name];
+      state.datasets[name] = nextValue;
+      if (nextValue) {
+        state.datasets[sectionKey] = true;
+      }
+    });
+  };
+
+  return (
+    <div
+      className={cn(
+        'flex flex-row items-center gap-v2-sm p-v2-md even:bg-grey-background-light',
+        mode !== 'view' && 'cursor-pointer',
+      )}
+      onClick={onClickItem}
+    >
+      <Checkbox
+        size="small"
+        checked={isSelected}
+        disabled={mode === 'view'}
+        onClick={onClickItem}
+        className="cursor-pointer"
+        stopPropagation
+      />
+      <span className="text-s">{label}</span>
+    </div>
+  );
+};
+
+const OVERFLOW_TAG_WIDTH_PX = 36;
+
+function formatItemName(name: string): string {
+  const last = name.split('.').at(-1) ?? name;
+  return capitalize(last);
+}
+
+const RemovableTag = ({ label, onRemove }: { label: string; onRemove: () => void }) => (
+  <Tag
+    color="purple"
+    size="small"
+    className="group cursor-pointer hover:bg-purple-primary/20 transition-colors"
+    onClick={onRemove}
+  >
+    <span className="flex items-center">
+      {/* Keep layout width stable (no flex-wrap flicker) while animating the visual centering. */}
+      <span className="max-w-[20ch] truncate text-center flex-1 translate-x-[9px] group-hover:translate-x-0 transition-transform duration-150">
+        {label}
+      </span>
+      <span className="inline-flex items-center justify-center w-4 ml-1 opacity-0 translate-x-1 group-hover:opacity-100 group-hover:translate-x-0 transition-[opacity,transform] duration-150">
+        <Icon icon="cross" className="size-3" />
+      </span>
+    </span>
+  </Tag>
+);
+
+const ViewTag = ({ label }: { label: string }) => (
+  <Tag color="purple" size="small" className="max-w-[150px] overflow-hidden">
+    <span className="truncate block">{label}</span>
+  </Tag>
+);
+
+type TopicItem = NonNullable<SectionData['topics']>[keyof NonNullable<SectionData['topics']>][number];
+type ConditionalTopicItem = NonNullable<SectionData['conditionalTopics']>[keyof NonNullable<
+  SectionData['conditionalTopics']
+>]['items'][number];
+
+const ConditionalFilterGroupRow = ({
+  sectionKey,
+  groupKey,
+  allItems,
+  dependsOnItems,
+}: {
+  sectionKey: ScreeningCategory;
+  groupKey: string;
+  allItems: ConditionalTopicItem[];
+  dependsOnItems: string[];
+}) => {
+  const selectedPrefixes = ListAndTopicDatasetConfiguration.select((state) =>
+    dependsOnItems.filter((t) => state.datasets[t]).map((t) => t),
+  );
+
+  const filteredItems =
+    selectedPrefixes.length === 0
+      ? allItems
+      : allItems.filter((item) => {
+          const prefix = item.key.split('.')[0];
+          return selectedPrefixes.some((sel) => sel === prefix);
+        });
+
+  if (filteredItems.length === 0) return null;
+
+  return <FilterGroupRow sectionKey={sectionKey} groupKey={groupKey} items={filteredItems} />;
+};
+
+const FilterGroupRow = ({
+  sectionKey,
+  groupKey,
+  items,
+  onAfterChange,
+}: {
+  sectionKey: ScreeningCategory;
+  groupKey: string;
+  items: TopicItem[];
+  onAfterChange?: () => void;
+}) => {
+  const mode = ListAndTopicDatasetConfiguration.select((state) => state.mode);
+  const label = capitalize(groupKey);
+
+  return (
+    <div className="flex items-start gap-v2-md px-v2-md py-v2-sm">
+      <span className="text-s font-semibold shrink-0">{label}:</span>
+      <div className="flex items-center gap-v2-sm flex-1 min-w-0">
+        {items.length === 1 && items[0] ? (
+          <SingleItemToggle item={items[0]} sectionKey={sectionKey} mode={mode} onAfterChange={onAfterChange} />
+        ) : (
+          <FilterGroupTags items={items} sectionKey={sectionKey} onAfterChange={onAfterChange} />
+        )}
+      </div>
+    </div>
+  );
+};
+
+const SingleItemToggle = ({
+  item,
+  sectionKey,
+  mode,
+  onAfterChange,
+}: {
+  item: TopicItem;
+  sectionKey: ScreeningCategory;
+  mode: string;
+  onAfterChange?: () => void;
+}) => {
+  const listConfig = ListAndTopicDatasetConfiguration.useSharp();
+  const isSelected = ListAndTopicDatasetConfiguration.select((state) => !!state.datasets[item.name]);
+  const { t } = useTranslation(['continuousScreening']);
+
+  if (isSelected) {
+    if (mode !== 'view') {
+      return (
+        <RemovableTag
+          label={item.title ?? formatItemName(item.name)}
+          onRemove={() => {
+            listConfig.update((state) => {
+              state.datasets[item.name] = false;
+            });
+            onAfterChange?.();
+          }}
+        />
+      );
+    }
+    return (
+      <Tag color="purple" size="small" className="max-w-[150px] overflow-hidden">
+        <span className="truncate block">{formatItemName(item.name)}</span>
+      </Tag>
+    );
+  }
+
+  if (mode === 'view') return null;
+
+  return (
+    <button
+      type="button"
+      className="flex items-center justify-center size-6 rounded-full border border-grey-border hover:bg-grey-background-light shrink-0"
+      onClick={() => {
+        listConfig.update((state) => {
+          state.datasets[item.name] = true;
+          state.datasets[sectionKey] = true;
+        });
+        onAfterChange?.();
+      }}
+      aria-labels={t('continuousScreening:creation.datasetSelection.filter.add')}
+    >
+      <Icon icon="plus" className="size-3" />
+    </button>
+  );
+};
+
+const MENU_BUTTON_SIZE_PX = 24; // size-6 = 1.5rem = 24px
+
+const FilterGroupTags = ({
+  items,
+  sectionKey,
+  onAfterChange,
+}: {
+  items: TopicItem[];
+  sectionKey: ScreeningCategory;
+  onAfterChange?: () => void;
+}) => {
+  const { t } = useTranslation(['continuousScreening']);
+  const listConfig = ListAndTopicDatasetConfiguration.useSharp();
+  const mode = ListAndTopicDatasetConfiguration.select((state) => state.mode);
+  const selectedItems = ListAndTopicDatasetConfiguration.select((state) => items.filter((i) => state.datasets[i.name]));
+  const [isExpanded, setIsExpanded] = useState(false);
+  const containerRef = useRef<HTMLDivElement>(null);
+  const ghostRef = useRef<HTMLDivElement>(null);
+  const [maxVisible, setMaxVisible] = useState(selectedItems.length);
+
+  const selectedKey = selectedItems.map((i) => i.name).join(',');
+
+  useLayoutEffect(() => {
+    if (isExpanded) return;
+    const container = containerRef.current;
+    const ghost = ghostRef.current;
+    if (!container || !ghost) return;
+
+    const recalculate = () => {
+      const gap = parseFloat(getComputedStyle(ghost).gap) || 4;
+      // subtract menu button + one gap when in edit mode
+      const menuReserved = mode !== 'view' ? MENU_BUTTON_SIZE_PX + gap : 0;
+      const availableWidth = container.offsetWidth - menuReserved;
+      const tagEls = Array.from(ghost.children) as HTMLElement[];
+
+      let used = 0;
+      let count = 0;
+      for (let i = 0; i < tagEls.length; i++) {
+        const tw = tagEls[i]!.offsetWidth;
+        const gapBefore = i > 0 ? gap : 0;
+        const isLast = i === tagEls.length - 1;
+        // reserve space for overflow tag on all but the last slot
+        const needed = used + gapBefore + tw + (isLast ? 0 : gap + OVERFLOW_TAG_WIDTH_PX);
+        if (needed <= availableWidth) {
+          used += gapBefore + tw;
+          count++;
+        } else {
+          break;
+        }
+      }
+      setMaxVisible(Math.max(count, 1));
+    };
+
+    const observer = new ResizeObserver(recalculate);
+    observer.observe(container);
+    recalculate();
+    return () => observer.disconnect();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isExpanded, selectedKey, mode]);
+
+  const isAllSelected = selectedItems.length === items.length && items.length > 1;
+  const overflow = isExpanded || isAllSelected ? 0 : Math.max(0, selectedItems.length - maxVisible);
+  const visible = overflow > 0 ? selectedItems.slice(0, maxVisible) : selectedItems;
+
+  return (
+    <div ref={containerRef} className="relative flex-1 min-w-0">
+      {/* Ghost: invisible clone of all selected tags used to measure their rendered widths */}
+      <div
+        ref={ghostRef}
+        className="flex items-center gap-v2-sm invisible absolute top-0 left-0 right-0 pointer-events-none"
+        aria-hidden="true"
+      >
+        {selectedItems.map((item) => {
+          const label = item.title ?? formatItemName(item.name);
+          return mode !== 'view' ? (
+            // Must match `RemovableTag` layout width, otherwise maxVisible/overflow calc is wrong.
+            <RemovableTag key={item.name} label={label} onRemove={() => undefined} />
+          ) : (
+            <Tag key={item.name} color="purple" size="small">
+              <span className="max-w-[20ch] truncate">{label}</span>
+            </Tag>
+          );
+        })}
+      </div>
+      <div className={cn('flex items-center gap-v2-sm', isExpanded && 'flex-wrap')}>
+        {isAllSelected ? (
+          <Tag color="purple" size="small">
+            {t('continuousScreening:creation.datasetSelection.filter.all')}
+          </Tag>
+        ) : (
+          <>
+            {visible.map((item) =>
+              mode !== 'view' ? (
+                <RemovableTag
+                  key={item.name}
+                  label={item.title ?? formatItemName(item.name)}
+                  onRemove={() => {
+                    listConfig.update((state) => {
+                      state.datasets[item.name] = false;
+                    });
+                    onAfterChange?.();
+                  }}
+                />
+              ) : (
+                <ViewTag key={item.name} label={item.title ?? formatItemName(item.name)} />
+              ),
+            )}
+            {overflow > 0 && (
+              <Tag
+                color="purple"
+                size="small"
+                className="cursor-pointer shrink-0 hover:bg-purple-primary/20 transition-colors"
+                onClick={() => setIsExpanded(true)}
+              >
+                +{overflow}
+              </Tag>
+            )}
+            {isExpanded && (
+              <Tag
+                color="purple"
+                size="small"
+                className="cursor-pointer shrink-0 hover:bg-purple-primary/20 transition-colors"
+                onClick={() => setIsExpanded(false)}
+              >
+                <Icon icon="minus" className="size-3" />
+              </Tag>
+            )}
+          </>
+        )}
+        {mode !== 'view' && <FilterGroupMenu items={items} sectionKey={sectionKey} onAfterChange={onAfterChange} />}
+      </div>
+    </div>
+  );
+};
+
+const FilterGroupMenu = ({
+  items,
+  sectionKey,
+  onAfterChange,
+}: {
+  items: TopicItem[];
+  sectionKey: ScreeningCategory;
+  onAfterChange?: () => void;
+}) => {
+  const { t } = useTranslation(['continuousScreening']);
+  const listConfig = ListAndTopicDatasetConfiguration.useSharp();
+  const datasets = ListAndTopicDatasetConfiguration.select((state) => state.datasets);
+  const allSelected = items.length > 0 && items.every((i) => !!datasets[i.name]);
+
+  return (
+    <MenuCommand.Menu persistOnSelect>
+      <MenuCommand.Trigger>
+        <button
+          type="button"
+          className="flex items-center justify-center size-6 rounded-full border border-grey-border hover:bg-grey-background-light shrink-0"
+        >
+          <Icon icon="plus" className="size-3" />
+        </button>
+      </MenuCommand.Trigger>
+      <MenuCommand.Content align="end" sideOffset={4}>
+        <MenuCommand.List>
+          <MenuCommand.Item
+            key="__all__"
+            value="__all__"
+            selected={allSelected}
+            onSelect={() => {
+              const nextValue = !allSelected;
+              listConfig.update((state) => {
+                for (const item of items) {
+                  state.datasets[item.name] = nextValue;
+                }
+                if (nextValue) {
+                  state.datasets[sectionKey] = true;
+                }
+              });
+              onAfterChange?.();
+            }}
+            className="border-b border-purple-primary"
+          >
+            <span className="text-purple-primary ">
+              {t(`continuousScreening:creation.datasetSelection.filter.${allSelected ? 'unselect_all' : 'select_all'}`)}
+            </span>
+            {allSelected && <Icon icon="tick" className="size-4 text-purple-primary" />}
+          </MenuCommand.Item>
+          {items.map((item) => {
+            const isSelected = !!datasets[item.name];
+            return (
+              <MenuCommand.Item
+                key={item.name}
+                value={item.name}
+                selected={isSelected}
+                onSelect={() => {
+                  listConfig.update((state) => {
+                    const nextValue = !state.datasets[item.name];
+                    state.datasets[item.name] = nextValue;
+                    if (nextValue) {
+                      state.datasets[sectionKey] = true;
+                    }
+                  });
+                  onAfterChange?.();
+                }}
+              >
+                <span>{item.title ?? formatItemName(item.name)}</span>
+                {isSelected && <Icon icon="tick" className="size-4 text-purple-primary" />}
+              </MenuCommand.Item>
+            );
+          })}
+        </MenuCommand.List>
+      </MenuCommand.Content>
+    </MenuCommand.Menu>
+  );
+};
diff --git a/packages/app-builder/src/components/ListAndTopicConfiguration/context/ListAndTopicDatasetConfiguration.ts b/packages/app-builder/src/components/ListAndTopicConfiguration/context/ListAndTopicDatasetConfiguration.ts
new file mode 100644
index 000000000..e754a70e6
--- /dev/null
+++ b/packages/app-builder/src/components/ListAndTopicConfiguration/context/ListAndTopicDatasetConfiguration.ts
@@ -0,0 +1,20 @@
+import { createSharpFactory } from 'sharpstate';
+
+export type ListAndTopicDatasetConfigurationMode = 'view' | 'edit' | 'create';
+
+type ListAndTopicDatasetConfigurationParams = {
+  datasets: Record<string, boolean>;
+  mode: ListAndTopicDatasetConfigurationMode;
+};
+
+export const ListAndTopicDatasetConfiguration = createSharpFactory({
+  name: 'ListAndTopicDatasetConfiguration',
+  initializer: (params: ListAndTopicDatasetConfigurationParams) => ({
+    datasets: params.datasets,
+    mode: params.mode,
+  }),
+}).withActions({
+  setMode(api, mode: ListAndTopicDatasetConfigurationMode) {
+    api.value.mode = mode;
+  },
+});
diff --git a/packages/app-builder/src/components/ListAndTopicConfiguration/dataset-selection-provider-utils.ts b/packages/app-builder/src/components/ListAndTopicConfiguration/dataset-selection-provider-utils.ts
new file mode 100644
index 000000000..79012dacc
--- /dev/null
+++ b/packages/app-builder/src/components/ListAndTopicConfiguration/dataset-selection-provider-utils.ts
@@ -0,0 +1,18 @@
+import {
+  ListAndTopicDatasetConfiguration,
+  ListAndTopicDatasetConfigurationMode,
+} from './context/ListAndTopicDatasetConfiguration';
+
+export function makeDatasetsMap(selected: string[]): Record<string, boolean> {
+  return Object.fromEntries(selected.map((name) => [name, true]));
+}
+
+export function useListAndTopicDatasetConfigurationSharp(params: {
+  datasets: Record<string, boolean>;
+  mode: ListAndTopicDatasetConfigurationMode;
+}) {
+  return ListAndTopicDatasetConfiguration.createSharp({
+    datasets: params.datasets,
+    mode: params.mode,
+  });
+}
diff --git a/packages/app-builder/src/components/ListAndTopicConfiguration/dataset-utils.ts b/packages/app-builder/src/components/ListAndTopicConfiguration/dataset-utils.ts
new file mode 100644
index 000000000..292362502
--- /dev/null
+++ b/packages/app-builder/src/components/ListAndTopicConfiguration/dataset-utils.ts
@@ -0,0 +1,14 @@
+import type { ListConfigFilters } from '@app-builder/queries/screening/lists-config';
+
+type SectionData = NonNullable<ListConfigFilters[keyof ListConfigFilters]>;
+
+export function getSectionLeafNames(section: SectionData): string[] {
+  const datasetNames = (section.datasets ?? []).flatMap((g) => g.datasets.map((d) => d.name));
+  const topicNames = Object.values(section.topics ?? {}).flatMap((items) => items.map((i) => i.name));
+  const conditionalTopicNames = Object.values(section.conditionalTopics ?? {}).flatMap((ct) =>
+    ct.items.map((i) => i.name),
+  );
+
+  // Note: `sectionKey` is intentionally not included: it's the section toggle, not a leaf item.
+  return [...new Set([...datasetNames, ...topicNames, ...conditionalTopicNames])];
+}
diff --git a/packages/app-builder/src/components/ListAndTopicConfiguration/index.ts b/packages/app-builder/src/components/ListAndTopicConfiguration/index.ts
new file mode 100644
index 000000000..32e84ec3e
--- /dev/null
+++ b/packages/app-builder/src/components/ListAndTopicConfiguration/index.ts
@@ -0,0 +1,7 @@
+export {
+  ListAndTopicDatasetConfiguration,
+  type ListAndTopicDatasetConfigurationMode,
+} from './context/ListAndTopicDatasetConfiguration';
+export { DatasetSelectionContent } from './DatasetSelectionContent';
+export { makeDatasetsMap, useListAndTopicDatasetConfigurationSharp } from './dataset-selection-provider-utils';
+export { getSectionLeafNames } from './dataset-utils';
diff --git a/packages/app-builder/src/components/Scenario/Screening/FieldDataset.tsx b/packages/app-builder/src/components/Scenario/Screening/FieldDataset.tsx
index 2e50c13d6..13bb5e8a8 100644
--- a/packages/app-builder/src/components/Scenario/Screening/FieldDataset.tsx
+++ b/packages/app-builder/src/components/Scenario/Screening/FieldDataset.tsx
@@ -1,168 +1,63 @@
 import { Callout } from '@app-builder/components/Callout';
-import { DatasetTag } from '@app-builder/components/Screenings/DatasetTag';
-import { type ScreeningCategory } from '@app-builder/models/screening';
-import { useEditorMode } from '@app-builder/services/editor/editor-mode';
-import clsx from 'clsx';
-import Fuse from 'fuse.js';
-import { type OpenSanctionsCatalogSection } from 'marble-api';
-import { diff, toggle } from 'radash';
-import { type Dispatch, memo, type SetStateAction, useEffect, useMemo, useState } from 'react';
+import {
+  DatasetSelectionContent,
+  ListAndTopicDatasetConfiguration,
+  makeDatasetsMap,
+} from '@app-builder/components/ListAndTopicConfiguration';
+import { useSignalEffect } from '@preact/signals-react';
+import { useEffect, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import { concat, intersection, map, pipe, unique } from 'remeda';
-import { Checkbox, CollapsibleV2, cn } from 'ui-design-system';
-import { Icon } from 'ui-icons';
 
-import { type DatasetFiltersForm, FieldDatasetFilters } from './FieldDatasetFilters';
+function getSelectedDatasets(datasets: Record<string, boolean>): string[] {
+  return Object.keys(datasets)
+    .filter((key) => datasets[key])
+    .sort();
+}
 
-const FieldCategory = memo(function FieldCategory({
-  section,
-  selectedIds,
-  filters,
-  updateSelectedIds,
-}: {
-  section: OpenSanctionsCatalogSection;
-  selectedIds: string[];
-  filters: DatasetFiltersForm;
-  updateSelectedIds: Dispatch<SetStateAction<string[]>>;
-}) {
-  const { t } = useTranslation(['common', 'scenarios']);
-  const [open, setOpen] = useState(false);
-  const editor = useEditorMode();
+function getDatasetsKey(datasets: string[]): string {
+  return [...datasets].sort().join(',');
+}
 
-  const sectionDatasetIds = useMemo(() => section.datasets.map((dataset) => dataset.name), [section.datasets]);
+export const FieldDataset = ({ value, onChange }: { value?: string[]; onChange?: (value: string[]) => void }) => {
+  const { t } = useTranslation();
+  const valueKey = useMemo(() => getDatasetsKey(value ?? []), [value]);
 
-  const selectedDatasetIds = useMemo(
-    () => intersection(sectionDatasetIds, selectedIds),
-    [sectionDatasetIds, selectedIds],
-  );
+  const listSharp = ListAndTopicDatasetConfiguration.createSharp({
+    datasets: makeDatasetsMap(value ?? []),
+    mode: 'edit',
+  });
 
-  const datasetIdsToShow = useMemo(
-    () =>
-      pipe(
-        section.datasets,
-        // We filter the datasets by user search if any
-        (datasets) =>
-          filters.search !== ''
-            ? new Fuse(datasets, {
-                keys: ['title'],
-                minMatchCharLength: 3,
-                threshold: 0.2,
-              })
-                .search(filters.search)
-                .map((i) => i.item)
-            : datasets,
-        // We filter the resulted datasets by selected tags if any
-        (datasets) =>
-          filters.tags.length > 0 ? datasets.filter((d) => d.tag && filters.tags.includes(d.tag)) : datasets,
-        // We get only the ids
-        map((d) => d.name),
-        // We don't forget to add the selected dataset ids
-        concat(selectedDatasetIds),
-        // Convenience
-        unique(),
-      ),
-    [filters, section, selectedDatasetIds],
-  );
+  const onChangeRef = useRef(onChange);
+  onChangeRef.current = onChange;
+  const lastValueKeyRef = useRef(valueKey);
+  lastValueKeyRef.current = valueKey;
 
-  const isAllSelected = useMemo(
-    () => diff(datasetIdsToShow, selectedDatasetIds).length === 0,
-    [datasetIdsToShow, selectedDatasetIds],
-  );
+  useEffect(() => {
+    const selectedKey = getDatasetsKey(getSelectedDatasets(listSharp.value.datasets));
+    if (selectedKey === valueKey) return;
 
-  return datasetIdsToShow.length > 0 ? (
-    <CollapsibleV2.Provider defaultOpen={open}>
-      <div key={section.name} className="w-full overflow-hidden rounded-lg">
-        <div className="bg-grey-background-light flex w-full items-center justify-between p-4">
-          <CollapsibleV2.Title onClick={() => setOpen(!open)} className="flex flex-row items-center gap-2">
-            <Icon
-              icon="arrow-right"
-              className={clsx('size-5', {
-                'rotate-90': open,
-              })}
-            />
-            <span className="text-s font-semibold">{section.title}</span>
-          </CollapsibleV2.Title>
-          <div className="flex items-center gap-4">
-            <span className="text-grey-secondary text-xs">
-              {isAllSelected
-                ? t('common:all_selected')
-                : selectedDatasetIds.length > 0
-                  ? t('scenarios:sanction.lists.nb_selected', {
-                      count: selectedDatasetIds.length,
-                    })
-                  : t('common:select_all')}
-            </span>
-            <Checkbox
-              disabled={editor === 'view'}
-              size="small"
-              checked={isAllSelected ? true : selectedDatasetIds.length > 0 ? 'indeterminate' : false}
-              onCheckedChange={(state) => {
-                updateSelectedIds((prev) => {
-                  let result: string[] = [...prev];
-                  const idsToToggle = state
-                    ? diff(datasetIdsToShow, result)
-                    : datasetIdsToShow.filter((id) => result.includes(id));
-                  for (const id of idsToToggle) {
-                    result = toggle(result, id);
-                  }
-                  return result;
-                });
-              }}
-            />
-          </div>
-        </div>
-        <CollapsibleV2.Content className="bg-grey-background-light w-full p-2">
-          <div
-            className={cn('rounded-lg', {
-              'border-grey-border bg-surface-card border': section.datasets.length > 0,
-            })}
-          >
-            {section.datasets
-              .filter((d) => datasetIdsToShow.includes(d.name))
-              .map((dataset) => (
-                <label
-                  key={dataset.name}
-                  className="hover:bg-grey-background-light flex cursor-pointer items-center justify-between p-2 transition-colors"
-                >
-                  <div id={dataset.name} className="flex items-center gap-2">
-                    <Checkbox
-                      disabled={editor === 'view'}
-                      size="small"
-                      checked={selectedIds.includes(dataset.name)}
-                      onCheckedChange={() => {
-                        updateSelectedIds((prev) => toggle(prev, dataset.name));
-                      }}
-                    />
-                    <span className="text-s">{dataset.title}</span>
-                  </div>
-                  {dataset.tag ? <DatasetTag category={dataset.tag as ScreeningCategory} /> : null}
-                </label>
-              ))}
-          </div>
-        </CollapsibleV2.Content>
-      </div>
-    </CollapsibleV2.Provider>
-  ) : null;
-});
+    const nextDatasets = makeDatasetsMap(value ?? []);
+    listSharp.update((state) => {
+      for (const key of Object.keys(state.datasets)) {
+        delete state.datasets[key];
+      }
+      for (const [key, isSelected] of Object.entries(nextDatasets)) {
+        state.datasets[key] = isSelected;
+      }
+    });
+  }, [listSharp, value, valueKey]);
 
-export const FieldDataset = ({
-  onChange,
-  onBlur,
-  sections,
-  defaultValue,
-}: {
-  defaultValue?: string[];
-  sections: OpenSanctionsCatalogSection[];
-  onChange?: (value: string[]) => void;
-  onBlur?: () => void;
-}) => {
-  const [selectedIds, updateSelectedIds] = useState<string[]>(defaultValue ?? []);
-  const [filters, setFilters] = useState<DatasetFiltersForm>({ tags: [], search: '' });
-  const { t } = useTranslation();
+  useSignalEffect(() => {
+    const selectedDatasets = getSelectedDatasets(listSharp.value.datasets);
+    const selectedKey = getDatasetsKey(selectedDatasets);
 
-  useEffect(() => {
-    onChange?.(selectedIds);
-  }, [selectedIds]);
+    if (selectedKey === lastValueKeyRef.current) {
+      return;
+    }
+
+    lastValueKeyRef.current = selectedKey;
+    onChangeRef.current?.(selectedDatasets);
+  });
 
   return (
     <div className="flex flex-col gap-2">
@@ -171,18 +66,9 @@ export const FieldDataset = ({
         <Callout variant="outlined">
           <p className="whitespace-pre-wrap">{t('scenarios:sanction.lists.callout')}</p>
         </Callout>
-        <FieldDatasetFilters sections={sections} filters={filters} setFilters={setFilters} />
-        <div onBlur={onBlur} className="flex flex-col gap-4">
-          {sections.map((section) => (
-            <FieldCategory
-              key={section.name}
-              section={section}
-              filters={filters}
-              selectedIds={selectedIds}
-              updateSelectedIds={updateSelectedIds}
-            />
-          ))}
-        </div>
+        <ListAndTopicDatasetConfiguration.Provider value={listSharp}>
+          <DatasetSelectionContent useCase="transaction_monitoring" />
+        </ListAndTopicDatasetConfiguration.Provider>
       </div>
     </div>
   );
diff --git a/packages/app-builder/src/components/Screenings/FreeformSearch/DatasetsPopover.tsx b/packages/app-builder/src/components/Screenings/FreeformSearch/DatasetsPopover.tsx
index 10dc75037..21e6404c7 100644
--- a/packages/app-builder/src/components/Screenings/FreeformSearch/DatasetsPopover.tsx
+++ b/packages/app-builder/src/components/Screenings/FreeformSearch/DatasetsPopover.tsx
@@ -1,16 +1,17 @@
-import { type ScreeningCategory } from '@app-builder/models/screening';
-import { useScreeningDatasetsQuery } from '@app-builder/queries/screening/datasets';
-import * as Collapsible from '@radix-ui/react-collapsible';
+import {
+  DatasetSelectionContent,
+  getSectionLeafNames,
+  ListAndTopicDatasetConfiguration,
+  makeDatasetsMap,
+  useListAndTopicDatasetConfigurationSharp,
+} from '@app-builder/components/ListAndTopicConfiguration';
+import { useListConfigQuery } from '@app-builder/queries/screening/lists-config';
 import * as Popover from '@radix-ui/react-popover';
 import clsx from 'clsx';
-import { type OpenSanctionsCatalogSection } from 'marble-api';
 import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { match } from 'ts-pattern';
-import { Button, Checkbox, Input } from 'ui-design-system';
+import { Button } from 'ui-design-system';
 import { Icon } from 'ui-icons';
-
-import { DatasetTag } from '../DatasetTag';
 import { screeningsI18n } from '../screenings-i18n';
 
 export interface DatasetsPopoverProps {
@@ -20,63 +21,41 @@ export interface DatasetsPopoverProps {
 
 export const DatasetsPopover = ({ selectedDatasets, onApply }: DatasetsPopoverProps) => {
   const { t } = useTranslation(screeningsI18n);
-  const datasetsQuery = useScreeningDatasetsQuery();
+  const listConfigQuery = useListConfigQuery('manual_search');
   const [open, setOpen] = useState(false);
-  const [tempSelected, setTempSelected] = useState<string[]>(selectedDatasets);
-  const [searchQuery, setSearchQuery] = useState('');
+  const [datasetsMap, setDatasetsMap] = useState<Record<string, boolean>>(() => makeDatasetsMap(selectedDatasets));
+  const listSharp = useListAndTopicDatasetConfigurationSharp({ datasets: datasetsMap, mode: 'edit' });
 
   // Reset temp selection when popover opens
   const handleOpenChange = (isOpen: boolean) => {
     if (isOpen) {
-      setTempSelected(selectedDatasets);
-      setSearchQuery('');
+      setDatasetsMap(makeDatasetsMap(selectedDatasets));
     }
     setOpen(isOpen);
   };
 
+  const selectableLeafNames = useMemo(() => {
+    const data = listConfigQuery.data;
+    if (!data) return undefined;
+    return Object.values(data).flatMap((section) => (section ? getSectionLeafNames(section) : []));
+  }, [listConfigQuery.data]);
+
   const handleApply = () => {
-    onApply(tempSelected);
+    if (!selectableLeafNames) {
+      setOpen(false);
+      return;
+    }
+    const map = listSharp.value.datasets;
+    const next = selectableLeafNames?.filter((name) => !!map[name]);
+    onApply(next);
     setOpen(false);
   };
 
   const handleCancel = () => {
-    setTempSelected(selectedDatasets);
+    setDatasetsMap(makeDatasetsMap(selectedDatasets));
     setOpen(false);
   };
 
-  const toggleDataset = (datasetName: string) => {
-    setTempSelected((prev) =>
-      prev.includes(datasetName) ? prev.filter((d) => d !== datasetName) : [...prev, datasetName],
-    );
-  };
-
-  const toggleSection = (section: OpenSanctionsCatalogSection, select: boolean) => {
-    const datasetNames = section.datasets.map((d) => d.name);
-    setTempSelected((prev) => {
-      if (select) {
-        return [...new Set([...prev, ...datasetNames])];
-      } else {
-        return prev.filter((d) => !datasetNames.includes(d));
-      }
-    });
-  };
-
-  // Filter sections based on search query
-  const filteredSections = useMemo(() => {
-    if (!datasetsQuery.data?.datasets.sections) return [];
-    if (!searchQuery.trim()) return datasetsQuery.data.datasets.sections;
-
-    const query = searchQuery.toLowerCase();
-    return datasetsQuery.data.datasets.sections
-      .map((section) => ({
-        ...section,
-        datasets: section.datasets.filter(
-          (dataset) => dataset.title.toLowerCase().includes(query) || dataset.name.toLowerCase().includes(query),
-        ),
-      }))
-      .filter((section) => section.datasets.length > 0);
-  }, [datasetsQuery.data?.datasets.sections, searchQuery]);
-
   return (
     <Popover.Root open={open} onOpenChange={handleOpenChange}>
       <Popover.Trigger asChild>
@@ -102,61 +81,14 @@ export const DatasetsPopover = ({ selectedDatasets, onApply }: DatasetsPopoverPr
       </Popover.Trigger>
       <Popover.Portal>
         <Popover.Content
-          className="bg-surface-card border-grey-border z-50 flex w-[500px] flex-col rounded-lg border shadow-lg"
+          className="bg-surface-card border-grey-border z-50 flex w-[min(50vw,700px)] flex-col rounded-lg border shadow-lg max-h-[60vh]"
           sideOffset={4}
           align="start"
         >
-          {/* Search input */}
-          <div className="border-grey-border border-b p-4">
-            <Input
-              type="text"
-              placeholder={t('screenings:freeform_search.datasets_search_placeholder')}
-              value={searchQuery}
-              onChange={(e) => setSearchQuery(e.target.value)}
-              className="w-full"
-            />
-          </div>
+          <ListAndTopicDatasetConfiguration.Provider value={listSharp}>
+            <DatasetSelectionContent useCase="manual_search" />
+          </ListAndTopicDatasetConfiguration.Provider>
 
-          {/* Datasets list */}
-          <div className="max-h-[300px] overflow-y-auto">
-            {match(datasetsQuery)
-              .with({ isPending: true }, () => (
-                <div className="flex items-center justify-center p-4">
-                  <Icon icon="spinner" className="text-grey-placeholder size-5 animate-spin" />
-                </div>
-              ))
-              .with({ isError: true }, () => (
-                <div className="flex flex-col items-center gap-2 p-4">
-                  <span className="text-s text-grey-placeholder">{t('common:generic_fetch_data_error')}</span>
-                  <Button variant="secondary" size="small" onClick={() => datasetsQuery.refetch()}>
-                    {t('common:retry')}
-                  </Button>
-                </div>
-              ))
-              .otherwise(() =>
-                filteredSections.length === 0 ? (
-                  <div className="flex items-center justify-center p-4">
-                    <span className="text-s text-grey-placeholder">
-                      {t('screenings:freeform_search.datasets_no_results')}
-                    </span>
-                  </div>
-                ) : (
-                  <div className="flex flex-col">
-                    {filteredSections.map((section) => (
-                      <DatasetSectionCollapsible
-                        key={section.name}
-                        section={section}
-                        selectedDatasets={tempSelected}
-                        onToggleDataset={toggleDataset}
-                        onToggleSection={toggleSection}
-                      />
-                    ))}
-                  </div>
-                ),
-              )}
-          </div>
-
-          {/* Actions */}
           <div className="border-grey-border flex gap-2 border-t p-4">
             <Button
               type="button"
@@ -173,6 +105,7 @@ export const DatasetsPopover = ({ selectedDatasets, onApply }: DatasetsPopoverPr
               size="default"
               className="flex-1 justify-center"
               onClick={handleApply}
+              disabled={!selectableLeafNames}
             >
               {t('screenings:freeform_search.apply')}
             </Button>
@@ -182,75 +115,3 @@ export const DatasetsPopover = ({ selectedDatasets, onApply }: DatasetsPopoverPr
     </Popover.Root>
   );
 };
-
-interface DatasetSectionCollapsibleProps {
-  section: OpenSanctionsCatalogSection;
-  selectedDatasets: string[];
-  onToggleDataset: (datasetName: string) => void;
-  onToggleSection: (section: OpenSanctionsCatalogSection, select: boolean) => void;
-}
-
-const DatasetSectionCollapsible = ({
-  section,
-  selectedDatasets,
-  onToggleDataset,
-  onToggleSection,
-}: DatasetSectionCollapsibleProps) => {
-  const { t } = useTranslation(screeningsI18n);
-  const selectedCount = section.datasets.filter((d) => selectedDatasets.includes(d.name)).length;
-  const isAllSelected = selectedCount === section.datasets.length;
-  const isPartiallySelected = selectedCount > 0 && selectedCount < section.datasets.length;
-
-  return (
-    <Collapsible.Root className="border-grey-border border-b last:border-b-0">
-      <Collapsible.Trigger asChild>
-        <button
-          type="button"
-          className="text-s hover:bg-grey-background-light flex w-full items-center justify-between p-3"
-        >
-          <div className="flex items-center gap-2">
-            <Icon
-              icon="caret-down"
-              className="size-4 transition-transform duration-200 group-radix-state-open:rotate-180"
-            />
-            <span className="font-semibold">{section.title}</span>
-            {selectedCount > 0 && <span className="text-grey-placeholder text-xs">({selectedCount})</span>}
-          </div>
-          <div className="flex items-center gap-2" onClick={(e) => e.stopPropagation()}>
-            <Checkbox
-              size="small"
-              checked={isAllSelected ? true : isPartiallySelected ? 'indeterminate' : false}
-              onCheckedChange={() => onToggleSection(section, !isAllSelected)}
-            />
-            <span className="text-xs" onClick={() => onToggleSection(section, !isAllSelected)}>
-              {isAllSelected ? t('common:select_none') : t('common:select_all')}
-            </span>
-          </div>
-        </button>
-      </Collapsible.Trigger>
-      <Collapsible.Content>
-        <div className="flex flex-col">
-          {section.datasets.map((dataset) => (
-            <label
-              key={dataset.name}
-              className={clsx(
-                'text-s flex cursor-pointer items-center justify-between px-3 py-2 pl-9',
-                'hover:bg-grey-background-light',
-              )}
-            >
-              <div className="flex items-center gap-2">
-                <Checkbox
-                  size="small"
-                  checked={selectedDatasets.includes(dataset.name)}
-                  onCheckedChange={() => onToggleDataset(dataset.name)}
-                />
-                <span>{dataset.title}</span>
-              </div>
-              {dataset.tag && <DatasetTag category={dataset.tag as ScreeningCategory} />}
-            </label>
-          ))}
-        </div>
-      </Collapsible.Content>
-    </Collapsible.Root>
-  );
-};
diff --git a/packages/app-builder/src/constants/ftm-entities.ts b/packages/app-builder/src/constants/ftm-entities.ts
index c5ab3e133..7c7a9929d 100644
--- a/packages/app-builder/src/constants/ftm-entities.ts
+++ b/packages/app-builder/src/constants/ftm-entities.ts
@@ -1,8 +1,9 @@
+import { SemanticSubTypeField, SemanticTypeField } from '@app-builder/models';
 import { FtmEntity } from 'marble-api';
 
 export const FTM_ENTITIES: FtmEntity[] = ['Person', 'Company', 'Organization', 'Vessel', 'Airplane'];
 
-export const FTM_ENTITIES_PROPERTIES: Record<FtmEntity, string[]> = {
+export const FTM_ENTITIES_PROPERTIES = {
   Person: [
     'name',
     'firstName',
@@ -32,4 +33,48 @@ export const FTM_ENTITIES_PROPERTIES: Record<FtmEntity, string[]> = {
   Organization: ['name', 'registrationNumber', 'jurisdiction', 'country', 'email', 'phone', 'website', 'mainCountry'],
   Vessel: ['name', 'imoNumber', 'registrationNumber', 'mmsi', 'callSign', 'country', 'flag'],
   Airplane: ['name', 'registrationNumber', 'country'],
-};
+} as const satisfies Record<FtmEntity, readonly string[]>;
+
+type FtmEntityProperty<T extends FtmEntity> = (typeof FTM_ENTITIES_PROPERTIES)[T][number];
+export type FtmEntityPropertyKey = {
+  [E in FtmEntity]: `${E}.${FtmEntityProperty<E>}`;
+}[FtmEntity];
+
+export const FTM_ENTITIES_SUGGESTIONS = {
+  'Person.name': { semanticType: 'name', semanticSubType: 'caption' },
+  'Person.firstName': { semanticType: 'name', semanticSubType: 'first_name' },
+  'Person.lastName': { semanticType: 'name', semanticSubType: 'last_name' },
+  'Person.email': { semanticType: 'link', semanticSubType: 'email' },
+  'Person.phone': { semanticType: 'link', semanticSubType: 'phone' },
+  'Person.country': { semanticType: 'country' },
+  'Person.birthDate': { semanticType: 'date_of_birth' },
+  'Company.name': { semanticType: 'name', semanticSubType: 'caption' },
+  'Company.registrationNumber': { semanticType: 'unique_id', semanticSubType: 'registration_number' },
+  'Company.country': { semanticType: 'country' },
+  'Company.email': { semanticType: 'link', semanticSubType: 'email' },
+  'Company.phone': { semanticType: 'link', semanticSubType: 'phone' },
+  'Company.website': { semanticType: 'link', semanticSubType: 'url' },
+  'Company.mainCountry': { semanticType: 'country' },
+  'Organization.name': { semanticType: 'name', semanticSubType: 'caption' },
+  'Organization.registrationNumber': { semanticType: 'unique_id', semanticSubType: 'registration_number' },
+  'Organization.jurisdiction': { semanticType: 'country' },
+  'Organization.country': { semanticType: 'country' },
+  'Organization.email': { semanticType: 'link', semanticSubType: 'email' },
+  'Organization.phone': { semanticType: 'link', semanticSubType: 'phone' },
+  'Organization.website': { semanticType: 'link', semanticSubType: 'url' },
+  'Organization.mainCountry': { semanticType: 'country' },
+  'Vessel.name': { semanticType: 'name', semanticSubType: 'caption' },
+  'Vessel.registrationNumber': { semanticType: 'unique_id', semanticSubType: 'registration_number' },
+  'Vessel.country': { semanticType: 'country' },
+  'Airplane.name': { semanticType: 'name', semanticSubType: 'caption' },
+  'Airplane.registrationNumber': { semanticType: 'unique_id', semanticSubType: 'registration_number' },
+  'Airplane.country': { semanticType: 'country' },
+} as const satisfies Partial<
+  Record<FtmEntityPropertyKey, { semanticType: SemanticTypeField; semanticSubType?: SemanticSubTypeField }>
+>;
+
+type FtmEntitySuggestion = { semanticType: SemanticTypeField; semanticSubType?: SemanticSubTypeField };
+
+export function getFtmEntitySuggestion(key: FtmEntityPropertyKey): FtmEntitySuggestion | undefined {
+  return (FTM_ENTITIES_SUGGESTIONS as Partial<Record<FtmEntityPropertyKey, FtmEntitySuggestion>>)[key];
+}
diff --git a/packages/app-builder/src/locales/ar/continuous-screening.json b/packages/app-builder/src/locales/ar/continuous-screening.json
index 4975def5b..4ea77ca7d 100644
--- a/packages/app-builder/src/locales/ar/continuous-screening.json
+++ b/packages/app-builder/src/locales/ar/continuous-screening.json
@@ -8,12 +8,18 @@
   "configurations.list.empty": "لم يتم العثور على أي إعدادات",
   "configurations.list.loading": "جارٍ تحميل الإعدادات…",
   "creation.datasetSelection.callout": "حدِّد القوائم التي سيتم استخدامها لهذا الفحص المستمر. ستتلقى تنبيهات كلما تمت إضافة إدخال جديد إلى تلك القوائم، أو تعديله، وكان يطابق ملف كيان خاضع للمراقبة في Marble.",
+  "creation.datasetSelection.filter.add": "إضافة عنصر",
+  "creation.datasetSelection.filter.all": "الكل",
+  "creation.datasetSelection.filter.select_all": "تحديد الكل",
+  "creation.datasetSelection.filter.unselect_all": "إلغاء تحديد الكل",
   "creation.datasetSelection.list.count_one": "تم اختيار {{count}} قائمة",
   "creation.datasetSelection.list.count_other": "تم اختيار {{count}} قوائم",
   "creation.datasetSelection.list.count_zero": "تم اختيار 0 قوائم",
   "creation.datasetSelection.list.section.select_all": "تحديد الكل",
   "creation.datasetSelection.list.section.unselect_all": "إلغاء تحديد الكل",
   "creation.datasetSelection.list.title": "القوائم",
+  "creation.datasetSelection.recap.section_items_one": "({{count}} عنصر)",
+  "creation.datasetSelection.recap.section_items_other": "({{count}} عناصر)",
   "creation.datasetSelection.recap.title_one": "القائمة المستخدمة ({{count}}):",
   "creation.datasetSelection.recap.title_other": "القوائم المستخدمة ({{count}}):",
   "creation.datasetSelection.recap.title_zero": "القوائم المستخدمة: 0",
@@ -25,6 +31,7 @@
   "creation.objectMapping.configurator.fieldMapping.explanation": "حدِّد أي حقل من كائن Marble (على اليسار، كما هو مُعرَّف في نموذج البيانات) يقابل أي حقل معياري من قوائم البيانات (على اليمين). الحقول المستخدمة بالفعل في إعداد مراقبة آخر لا يمكن تعديلها. يمكن أن تُطابِق عدة حقول من Marble نفس الحقل في قائمة البيانات.",
   "creation.objectMapping.configurator.fieldMapping.none": "لا شيء",
   "creation.objectMapping.configurator.fieldMapping.placeholder": "اختر حقلاً",
+  "creation.objectMapping.configurator.fieldMapping.suggest": "اقترح مطابقات الحقول",
   "creation.objectMapping.configurator.fieldMapping.title": "مطابقة الحقول",
   "creation.objectMapping.configurator.ftmEntity.placeholder": "اختر كيانًا",
   "creation.objectMapping.configurator.ftmEntity.subtitle": "اختر نوع كيان. سيتم البحث في القوائم عن الكائنات التي ترسلها للفحص على أنها من هذا النوع. على سبيل المثال، إذا اخترت «شخص»، فسيتم البحث عن كل كائن ترسله ضمن جميع الأشخاص الطبيعيين في قوائم البيانات.",
diff --git a/packages/app-builder/src/locales/en/continuous-screening.json b/packages/app-builder/src/locales/en/continuous-screening.json
index bbf779b77..53875442d 100644
--- a/packages/app-builder/src/locales/en/continuous-screening.json
+++ b/packages/app-builder/src/locales/en/continuous-screening.json
@@ -8,12 +8,18 @@
   "configurations.list.empty": "No configurations found",
   "configurations.list.loading": "Loading configurations...",
   "creation.datasetSelection.callout": "Select the lists that will be used for this continuous screening. You will receive alerts every time a new entity is put under monitoring and matches an entry on those lists, or every time a new entry on the lists matches the profile of an actively monitored entity in Marble.",
+  "creation.datasetSelection.filter.add": "Add a topic",
+  "creation.datasetSelection.filter.all": "All",
+  "creation.datasetSelection.filter.select_all": "Select all",
+  "creation.datasetSelection.filter.unselect_all": "Unselect all",
   "creation.datasetSelection.list.count_one": "{{count}} list selected",
   "creation.datasetSelection.list.count_other": "{{count}} lists selected",
   "creation.datasetSelection.list.count_zero": "0 lists selected",
   "creation.datasetSelection.list.section.select_all": "Select all",
   "creation.datasetSelection.list.section.unselect_all": "Unselect all",
   "creation.datasetSelection.list.title": "Lists",
+  "creation.datasetSelection.recap.section_items_one": "({{count}} item)",
+  "creation.datasetSelection.recap.section_items_other": "({{count}} items)",
   "creation.datasetSelection.recap.title_one": "{{count}} list used:",
   "creation.datasetSelection.recap.title_other": "{{count}} lists used:",
   "creation.datasetSelection.recap.title_zero": "0 lists used",
@@ -25,6 +31,7 @@
   "creation.objectMapping.configurator.fieldMapping.explanation": "Select which field of the Marble object (on the left, as configured in the data model) maps to which standard field from the data lists (on the right). Fields that are already used in another screening configuration cannot be modified. Several Marble fields may map to the same data list field.",
   "creation.objectMapping.configurator.fieldMapping.none": "None",
   "creation.objectMapping.configurator.fieldMapping.placeholder": "Select a field",
+  "creation.objectMapping.configurator.fieldMapping.suggest": "Suggest field mappings",
   "creation.objectMapping.configurator.fieldMapping.title": "Field mapping",
   "creation.objectMapping.configurator.ftmEntity.placeholder": "Select an entity",
   "creation.objectMapping.configurator.ftmEntity.subtitle": "Select an entity type. Objects you send for screening will be searched in the lists as this type. For example, if you choose 'Person', every object you send will be searched among all physical persons in the data lists.",
diff --git a/packages/app-builder/src/locales/fr/continuous-screening.json b/packages/app-builder/src/locales/fr/continuous-screening.json
index a5d23d4b8..8ac79432f 100644
--- a/packages/app-builder/src/locales/fr/continuous-screening.json
+++ b/packages/app-builder/src/locales/fr/continuous-screening.json
@@ -8,12 +8,18 @@
   "configurations.list.empty": "Aucune configuration trouvée",
   "configurations.list.loading": "Chargement des configurations…",
   "creation.datasetSelection.callout": "Sélectionnez les listes à utiliser pour monitoring permanent. Vous recevrez des alertes chaque fois qu’une nouvelle entrée de ces listes correspond au profil d’une entité surveillée dans Marble.",
+  "creation.datasetSelection.filter.add": "Ajouter un sujet",
+  "creation.datasetSelection.filter.all": "Tout",
+  "creation.datasetSelection.filter.select_all": "Tout sélectionner",
+  "creation.datasetSelection.filter.unselect_all": "Tout désélectionner",
   "creation.datasetSelection.list.count_one": "{{count}} liste sélectionnée",
   "creation.datasetSelection.list.count_other": "{{count}} listes sélectionnées",
   "creation.datasetSelection.list.count_zero": "0 listes sélectionnées",
   "creation.datasetSelection.list.section.select_all": "Tout sélectionner",
   "creation.datasetSelection.list.section.unselect_all": "Tout désélectionner",
   "creation.datasetSelection.list.title": "Listes",
+  "creation.datasetSelection.recap.section_items_one": "({{count}} élément)",
+  "creation.datasetSelection.recap.section_items_other": "({{count}} éléments)",
   "creation.datasetSelection.recap.title_one": "{{count}} liste utilisée :",
   "creation.datasetSelection.recap.title_other": "{{count}} listes utilisées :",
   "creation.datasetSelection.recap.title_zero": "0 listes utilisées",
@@ -25,6 +31,7 @@
   "creation.objectMapping.configurator.fieldMapping.explanation": "Sélectionnez quel champ de l’objet Marble (à gauche, tel que configuré dans le modèle de données) correspond à quel champ standard des listes de données (à droite). Les champs déjà utilisés dans une autre configuration de monitoring permanent ne peuvent pas être modifiés. Plusieurs champs Marble peuvent correspondre au même champ de liste de données.",
   "creation.objectMapping.configurator.fieldMapping.none": "Aucun",
   "creation.objectMapping.configurator.fieldMapping.placeholder": "Sélectionner un champ",
+  "creation.objectMapping.configurator.fieldMapping.suggest": "Suggérer des correspondances",
   "creation.objectMapping.configurator.fieldMapping.title": "Correspondance des champs",
   "creation.objectMapping.configurator.ftmEntity.placeholder": "Sélectionner une entité",
   "creation.objectMapping.configurator.ftmEntity.subtitle": "Sélectionnez un type d’entité. Les objets seront recherchés dans les listes parmi les entrées de ce type. Par exemple, si vous choisissez « Personne », chaque objet envoyé sera recherché parmi toutes les personnes physiques des listes de données.",
diff --git a/packages/app-builder/src/models/continuous-screening.ts b/packages/app-builder/src/models/continuous-screening.ts
index e6dd21ad9..e71367739 100644
--- a/packages/app-builder/src/models/continuous-screening.ts
+++ b/packages/app-builder/src/models/continuous-screening.ts
@@ -9,6 +9,7 @@ import {
   CreateContinuousScreeningConfigDto,
   FtmEntity,
   OpenSanctionsEntityDto,
+  ScreeningConfigBodyFiltersDto,
   ScreeningQueryDto,
 } from 'marble-api';
 import * as R from 'remeda';
@@ -79,17 +80,52 @@ export type CreateContinuousScreeningConfig = {
   mappingConfigs: CreateMappingConfig[];
 };
 
+function createContinuousScreeningFilters(selection: string[]): ScreeningConfigBodyFiltersDto {
+  const filters: ScreeningConfigBodyFiltersDto = {
+    sanctions: { enabled: false },
+    peps: { enabled: false },
+    adverse_media: { enabled: false },
+    other: { enabled: false },
+  };
+  for (const item of selection) {
+    const chunks = item.split(':');
+    const section = chunks[0] as keyof ScreeningConfigBodyFiltersDto;
+    if (!filters[section]) continue;
+    if (chunks.length === 1) filters[section].enabled = true;
+    if (chunks.length < 3) continue;
+    const type = chunks[1];
+    if (type !== 'dataset' && type !== 'topic') continue;
+    const name = chunks[2] as string;
+    if (!name) continue;
+    if (type === 'dataset') {
+      if (!filters[section].datasets) filters[section].datasets = [];
+      filters[section].datasets.push(name);
+      continue;
+    }
+    const value = chunks[3] as string;
+    if (!value) continue;
+    if (type === 'topic') {
+      if (!filters[section].topics) filters[section].topics = {};
+      if (!filters[section].topics[name]) filters[section].topics[name] = [];
+      filters[section].topics[name].push(value);
+    }
+  }
+  return filters;
+}
+
 export function adaptCreateContinuousScreeningConfigDto(
   configuration: CreateContinuousScreeningConfig,
 ): CreateContinuousScreeningConfigDto {
+  const datasets = Object.entries(configuration.datasets)
+    .filter(([_, value]) => value)
+    .map(([key]) => key);
   return {
     name: configuration.name,
     description: configuration.description,
     object_types: configuration.mappingConfigs.map((mc) => mc.objectType),
     algorithm: configuration.algorithm,
-    datasets: Object.entries(configuration.datasets)
-      .filter(([_, value]) => value)
-      .map(([key]) => key),
+    datasets: [],
+    filters: createContinuousScreeningFilters(datasets),
     inbox_id: configuration.inboxId,
     match_threshold: configuration.matchThreshold,
     match_limit: configuration.matchLimit,
diff --git a/packages/app-builder/src/models/screening.ts b/packages/app-builder/src/models/screening.ts
index 418bf5414..0aa0b2bf3 100644
--- a/packages/app-builder/src/models/screening.ts
+++ b/packages/app-builder/src/models/screening.ts
@@ -1,4 +1,6 @@
 import {
+  type listScreeningAvailableFilters,
+  ScreeningAvailableFilters,
   type ScreeningDto,
   type ScreeningEntityDto,
   type ScreeningErrorDto,
@@ -30,6 +32,13 @@ export type ScreeningStatus = 'in_review' | 'confirmed_hit' | 'no_hit' | 'error'
 export type ScreeningMatchStatus = 'pending' | 'confirmed_hit' | 'no_hit' | 'skipped';
 export type OpenSanctionEntitySchema = (typeof openSanctionEntitySchemas)[number];
 
+export type AvailableFeatures = Parameters<typeof listScreeningAvailableFilters>[0];
+export const availableFeatures = [
+  'transaction_monitoring',
+  'continuous_monitoring',
+  'manual_search',
+] as const satisfies Array<AvailableFeatures>;
+
 export type OpenSanctionEntity = {
   id: string;
   schema: OpenSanctionEntitySchema;
@@ -318,12 +327,12 @@ export function isScreeningReviewCompleted(screening: Screening): screening is S
 
 export type ScreeningCategory = 'sanctions' | 'peps' | 'third-parties' | 'adverse-media';
 
-export const SCREENING_CATEGORY_COLORS: Record<ScreeningCategory, TagProps['color']> = {
+export const SCREENING_CATEGORY_COLORS = {
   sanctions: 'red',
   peps: 'blue',
   'third-parties': 'grey',
   'adverse-media': 'yellow',
-};
+} satisfies Record<ScreeningCategory, TagProps['color']>;
 
 export const SCREENING_TOPICS_MAP = new Map<string, ScreeningCategory>([
   // Sanctions
@@ -449,3 +458,7 @@ export const getHigherCategory = (topics: string[]): ScreeningCategory | 'other'
   const categories = R.map(topics, (topic) => SCREENING_TOPICS_MAP.get(topic) ?? 'other');
   return R.firstBy(categories, (category) => SCREENING_CATEGORY_RANKING[category]);
 };
+
+export type ScreeningAvailableFiltersAdapted = ScreeningAvailableFilters & {
+  conditional_filters?: { key: string; name: string; topics: { name: string; key?: string; title: string }[] }[];
+};
diff --git a/packages/app-builder/src/queries/screening/datasets.ts b/packages/app-builder/src/queries/screening/datasets.ts
index 9836776ec..16ddfd2a9 100644
--- a/packages/app-builder/src/queries/screening/datasets.ts
+++ b/packages/app-builder/src/queries/screening/datasets.ts
@@ -1,7 +1,6 @@
 import { getScreeningDatasetsFn } from '@app-builder/server-fns/screenings';
 import { useQuery } from '@tanstack/react-query';
 import { useServerFn } from '@tanstack/react-start';
-import { OpenSanctionsCatalogDto } from 'marble-api';
 
 export const useScreeningDatasetsQuery = () => {
   const getScreeningDatasets = useServerFn(getScreeningDatasetsFn);
@@ -10,7 +9,7 @@ export const useScreeningDatasetsQuery = () => {
     queryKey: ['screening', 'datasets'],
     queryFn: async () => {
       const result = await getScreeningDatasets();
-      return result as { datasets: OpenSanctionsCatalogDto };
+      return result;
     },
   });
 };
diff --git a/packages/app-builder/src/queries/screening/lists-config.ts b/packages/app-builder/src/queries/screening/lists-config.ts
new file mode 100644
index 000000000..a1f6b97a8
--- /dev/null
+++ b/packages/app-builder/src/queries/screening/lists-config.ts
@@ -0,0 +1,93 @@
+import { AvailableFeatures, ScreeningAvailableFiltersAdapted, ScreeningCategory } from '@app-builder/models/screening';
+import { getListConfigFn } from '@app-builder/server-fns/screenings';
+import { useQuery } from '@tanstack/react-query';
+import { useServerFn } from '@tanstack/react-start';
+import { ScreeningAvailableFilters, ScreeningAvailableFiltersSection } from 'marble-api';
+import * as R from 'remeda';
+
+type GroupedDataset = {
+  name: string;
+  title: string;
+  datasets: { name: string; title: string }[];
+};
+
+type ConditionalTopic = {
+  items: { name: string; key: string; title: string }[];
+  dependsOn: string;
+};
+
+type NormalizedSection = {
+  datasets?: GroupedDataset[];
+  topics?: Record<string, { name: string; title: string }[]>;
+  conditionalTopics?: Record<string, ConditionalTopic>;
+};
+
+export type ListConfigFilters = Partial<Record<ScreeningCategory, NormalizedSection>>;
+
+function groupBySection(datasets: { section?: string; name: string; title: string }[]): GroupedDataset[] {
+  return Object.entries(R.groupBy(datasets, (d) => d.section ?? d.name)).map(([section, items]) => ({
+    name: section,
+    title: section,
+    datasets: items.map(({ name, title }) => ({ name, title })),
+  }));
+}
+
+function normalizeListConfig(config: ScreeningAvailableFiltersAdapted): ListConfigFilters {
+  function normalize(
+    section: ScreeningAvailableFiltersSection | undefined,
+    type: keyof ScreeningAvailableFilters['sections'],
+  ): NormalizedSection | undefined {
+    if (!section) return undefined;
+    // complete all items name with section and key (sanctions, peps, adverse_medias)
+    for (const dataset of section.datasets ?? []) {
+      dataset.name = `${type}:dataset:${dataset.name}`;
+    }
+    for (const [key, topic] of Object.entries(section.topics ?? {})) {
+      for (const item of topic) {
+        item.name = `${type}:topic:${key}:${item.name}`;
+      }
+    }
+    const adaptedSection: NormalizedSection = {
+      ...section,
+      datasets: Array.isArray(section?.datasets) ? groupBySection(section.datasets) : undefined,
+    };
+
+    if (config.conditional_filters && section.topics) {
+      for (const cf of config.conditional_filters) {
+        if (cf.key && cf.key in section.topics) {
+          adaptedSection.conditionalTopics ??= {};
+          adaptedSection.conditionalTopics[cf.name] = {
+            items: cf.topics.map((t) => ({
+              name: `${type}:topic:${cf.key}:${cf.name}:${t.name}`,
+              key: `${type}:topic:${cf.key}:${t.name}`,
+              title: t.title,
+            })),
+            dependsOn: cf.key,
+          };
+        }
+      }
+    }
+
+    return adaptedSection;
+  }
+  if (!config) return {};
+
+  return {
+    sanctions: normalize(config.sections.sanctions, 'sanctions'),
+    peps: normalize(config.sections.peps, 'peps'),
+    'adverse-media': normalize(config.sections.adverse_media, 'adverse_media'),
+    'third-parties': normalize(config.sections.other, 'other'),
+  };
+}
+
+export const useListConfigQuery = (useCase: AvailableFeatures) => {
+  const getListConfig = useServerFn(getListConfigFn);
+
+  return useQuery({
+    queryKey: ['screening', 'datasets', useCase],
+    queryFn: async () => {
+      const result = await getListConfig({ data: { feature: useCase } });
+      return normalizeListConfig(result);
+    },
+  });
+};
diff --git a/packages/app-builder/src/repositories/ScreeningRepository.ts b/packages/app-builder/src/repositories/ScreeningRepository.ts
index d1ea98f80..148c30812 100644
--- a/packages/app-builder/src/repositories/ScreeningRepository.ts
+++ b/packages/app-builder/src/repositories/ScreeningRepository.ts
@@ -1,12 +1,14 @@
 import { type MarbleCoreApi } from '@app-builder/infra/marblecore-api';
 import { isNotFoundHttpError } from '@app-builder/models/http-errors';
 import {
+  type AvailableFeatures,
   adaptScreening,
   adaptScreeningFile,
   adaptScreeningMatch,
   adaptScreeningMatchPayload,
   type OpenSanctionEntitySchema,
   type Screening,
+  ScreeningAvailableFiltersAdapted,
   type ScreeningFile,
   type ScreeningMatch,
   type ScreeningMatchPayload,
@@ -51,10 +53,81 @@ export interface ScreeningRepository {
   }): Promise<ScreeningMatchPayload[]>;
   getAiSuggestions(args: { screeningId: string }): Promise<ScreeningAiSuggestion[]>;
   enrichedData(args: { entityId: string }): Promise<ScreeningMatchPayload>;
+  getAvailableFilters(args: { feature: AvailableFeatures }): Promise<ScreeningAvailableFiltersAdapted>;
 }
 
 export function makeGetScreeningRepository() {
   return (marbleCoreApiClient: MarbleCoreApi): ScreeningRepository => ({
+    getAvailableFilters: async ({ feature }) => {
+      const listFeature: ScreeningAvailableFiltersAdapted =
+        await marbleCoreApiClient.listScreeningAvailableFilters(feature);
+      // FOR TESTING
+      // listFeature.sections.peps = {
+      //   topics: {
+      //     kind_of_peps: [{ name: 'primary', title: 'Primary PEP' }],
+
+      //     relevant_continents: [
+      //       { name: 'africa', title: 'Africa' },
+      //       { name: 'asia', title: 'Asia' },
+      //       { name: 'europe', title: 'Europe' },
+      //       { name: 'north-aerica', title: 'North America' },
+      //       { name: 'south-america', title: 'South America' },
+      //       { name: 'oceania', title: 'Oceania' },
+      //     ],
+      //     relevant_positions: [
+      //       { name: 'president', title: 'President' },
+      //       { name: 'prime-minister', title: 'Prime Minister' },
+      //       { name: 'minister', title: 'Minister' },
+      //       { name: 'senator', title: 'Senator' },
+      //       { name: 'representative', title: 'Representative' },
+      //       { name: 'member-of-parliament', title: 'Member of Parliament' },
+      //       { name: 'member-of-legislature', title: 'Member of Legislature' },
+      //       { name: 'member-of-congress', title: 'Member of Congress' },
+      //       { name: 'member-of-assembly', title: 'Member of Assembly' },
+      //       { name: 'member-of-senate', title: 'Member of Senate' },
+      //       { name: 'member-of-house', title: 'Member of House' },
+      //       { name: 'member-of-board', title: 'Member of Board' },
+      //       { name: 'member-of-committee', title: 'Member of Committee' },
+      //       { name: 'member-of-commission', title: 'Member of Commission' },
+      //       { name: 'member-of-council', title: 'Member of Council' },
+      //       { name: 'member-of-governing-body', title: 'Member of Governing Body' },
+      //       { name: 'member-of-governing-council', title: 'Member of Governing Council' },
+      //       { name: 'member-of-governing-board', title: 'Member of Governing Board' },
+      //       { name: 'member-of-governing-committee', title: 'Member of Governing Committee' },
+      //       { name: 'member-of-governing-commission', title: 'Member of Governing Commission' },
+      //       { name: 'ngo-member', title: 'NGO Member' },
+      //       { name: 'ngo-board-member', title: 'NGO Board Member' },
+      //       { name: 'ngo-committee-member', title: 'NGO Committee Member' },
+      //       { name: 'ngo-commission-member', title: 'NGO Commission Member' },
+      //       { name: 'ngo-council-member', title: 'NGO Council Member' },
+      //       { name: 'ngo-governing-body-member', title: 'NGO Governing Body Member' },
+      //       { name: 'ngo-governing-council-member', title: 'NGO Governing Council Member' },
+      //       { name: 'ngo-governing-board-member', title: 'NGO Governing Board Member' },
+      //       { name: 'ngo-governing-committee-member', title: 'NGO Governing Committee Member' },
+      //       { name: 'ngo-governing-commission-member', title: 'NGO Governing Commission Member' },
+      //     ],
+      //   },
+      // };
+      // listFeature.conditional_filters = [
+      //   {
+      //     key: 'kind_of_peps',
+      //     name: 'kind_of_peps_options',
+      //     topics: [
+      //       { name: 'primary.option1', title: 'Primary PEP option 1' },
+      //       { name: 'primary.option2', title: 'Primary PEP option 2' },
+      //       { name: 'primary.option3', title: 'Primary PEP option 3' },
+      //       { name: 'primary.option4', title: 'Primary PEP option 4' },
+      //       { name: 'option5', title: 'Any PEP option 5' },
+      //       { name: 'option6', title: 'Any PEP option 6' },
+      //       { name: 'option7', title: 'Any PEP option 7' },
+      //       { name: 'option8', title: 'Any PEP option 8' },
+      //       { name: 'option9', title: 'Any PEP option 9' },
+      //       { name: 'option10', title: 'Any PEP option 10' },
+      //     ],
+      //   },
+      // ];
+      return listFeature;
+    },
     listDatasets: async () => {
       try {
         return await marbleCoreApiClient.listOpenSanctionDatasets();
diff --git a/packages/app-builder/src/routes/_app/_builder/detection/scenarios/$scenarioId/i/$iterationId/screenings.$screeningId.tsx b/packages/app-builder/src/routes/_app/_builder/detection/scenarios/$scenarioId/i/$iterationId/screenings.$screeningId.tsx
index 86fcb14d6..e5b8f8b9e 100644
--- a/packages/app-builder/src/routes/_app/_builder/detection/scenarios/$scenarioId/i/$iterationId/screenings.$screeningId.tsx
+++ b/packages/app-builder/src/routes/_app/_builder/detection/scenarios/$scenarioId/i/$iterationId/screenings.$screeningId.tsx
@@ -63,14 +63,13 @@ const screeningLoader = createServerFn({ method: 'GET' })
   .middleware([authMiddleware])
   .inputValidator(screeningLoaderDataSchema)
   .handler(async function screeningLoader({ data, context }) {
-    const { customListsRepository, dataModelRepository, scenario, screening, continuousScreening, entitlements } =
+    const { customListsRepository, dataModelRepository, scenario, continuousScreening, entitlements } =
       context.authInfo;
 
-    const [currentScenario, dataModel, customLists, { sections }, screeningConfigs] = await Promise.all([
+    const [currentScenario, dataModel, customLists, screeningConfigs] = await Promise.all([
       scenario.getScenario({ scenarioId: data.scenarioId }),
       dataModelRepository.getDataModel(),
       customListsRepository.listCustomLists(),
-      screening.listDatasets(),
       isContinuousScreeningAvailable(entitlements) ? continuousScreening.listConfigurations() : Promise.resolve([]),
     ]);
 
@@ -79,7 +78,6 @@ const screeningLoader = createServerFn({ method: 'GET' })
       payloadAccessors: buildPayloadAccessorsFromDataModel(dataModel, currentScenario.triggerObjectType),
       dataModel,
       customLists,
-      sections,
       entitlements,
       screeningConfigs,
       screeningId: data.screeningId,
@@ -214,7 +212,6 @@ function ScreeningDetail() {
     payloadAccessors,
     dataModel,
     customLists,
-    sections,
     entitlements,
     screeningConfigs: continuousScreeningConfigs,
     screeningId,
@@ -878,14 +875,7 @@ function ScreeningDetail() {
               </AstBuilder.Provider>
 
               <form.Field name="datasets">
-                {(field) => (
-                  <FieldDataset
-                    defaultValue={field.state.value}
-                    onChange={field.handleChange}
-                    onBlur={field.handleBlur}
-                    sections={sections}
-                  />
-                )}
+                {(field) => <FieldDataset value={field.state.value} onChange={field.handleChange} />}
               </form.Field>
             </div>
           </form>
diff --git a/packages/app-builder/src/server-fns/screenings.ts b/packages/app-builder/src/server-fns/screenings.ts
index a3cfb13ca..2c7bed6c1 100644
--- a/packages/app-builder/src/server-fns/screenings.ts
+++ b/packages/app-builder/src/server-fns/screenings.ts
@@ -1,12 +1,14 @@
 import { authMiddleware } from '@app-builder/middlewares/auth-middleware';
 import { isStatusConflictHttpError } from '@app-builder/models/http-errors';
-import { type Screening, type ScreeningMatchPayload } from '@app-builder/models/screening';
+import { availableFeatures, type Screening, type ScreeningMatchPayload } from '@app-builder/models/screening';
 import { type ScreeningAiSuggestion } from '@app-builder/models/screening-ai-suggestion';
 import { getServerEnv } from '@app-builder/utils/environment';
 import { getScreeningFileUploadEndpoint } from '@app-builder/utils/files';
 import { createServerFn } from '@tanstack/react-start';
 import { z } from 'zod/v4';
 
+/** Zod schemas and types */
+
 export const refineSearchSchema = z.discriminatedUnion('entityType', [
   z.object({
     screeningId: z.uuid(),
@@ -107,6 +109,19 @@ export type SearchActionResponse =
 
 export type RefineActionResponse = { success: true; data: Screening } | { success: false; error: unknown };
 
+export const getAvailableFiltersSchema = z.object({ feature: z.enum(availableFeatures) });
+export type GetAvailableFiltersInput = z.infer<typeof getAvailableFiltersSchema>;
+
+/** Server functions */
+
+export const getListConfigFn = createServerFn({ method: 'GET' })
+  .middleware([authMiddleware])
+  .inputValidator(getAvailableFiltersSchema)
+  .handler(async ({ context, data }) => {
+    const filter = await context.authInfo.screening.getAvailableFilters({ feature: data.feature });
+    return filter;
+  });
+
 export const getScreeningAiSuggestionsFn = createServerFn({ method: 'GET' })
   .middleware([authMiddleware])
   .inputValidator(z.object({ screeningId: z.string() }))
diff --git a/packages/marble-api/openapis/marblecore-api.yaml b/packages/marble-api/openapis/marblecore-api.yaml
index a4a50d134..318302254 100644
--- a/packages/marble-api/openapis/marblecore-api.yaml
+++ b/packages/marble-api/openapis/marblecore-api.yaml
@@ -223,6 +223,8 @@ paths:
     $ref: ./marblecore-api/screenings.yml#/~1screenings
   /screenings/datasets:
     $ref: ./marblecore-api/screenings.yml#/~1screenings~1datasets
+  /screenings/available-filters:
+    $ref: ./marblecore-api/screenings.yml#/~1screenings~1available-filters
   /screenings/{screeningId}/files:
     $ref: ./marblecore-api/screenings.yml#/~1screenings~1{screeningId}~1files
   /screenings/{screeningId}/files/{fileId}:
diff --git a/packages/marble-api/openapis/marblecore-api/_schemas.yml b/packages/marble-api/openapis/marblecore-api/_schemas.yml
index b5f7bf678..7b4d8604f 100644
--- a/packages/marble-api/openapis/marblecore-api/_schemas.yml
+++ b/packages/marble-api/openapis/marblecore-api/_schemas.yml
@@ -281,12 +281,20 @@ OpenSanctionsCatalogDataset:
   $ref: screenings.yml#/components/schemas/OpenSanctionsCatalogDataset
 OpenSanctionsCatalogSection:
   $ref: screenings.yml#/components/schemas/OpenSanctionsCatalogSection
+ScreeningAvailableFilters:
+  $ref: screenings.yml#/components/schemas/ScreeningAvailableFilters
+ScreeningAvailableFiltersSection:
+  $ref: screenings.yml#/components/schemas/ScreeningAvailableFiltersSection
 OpenSanctionsDatasetFreshnessDto:
   $ref: screenings.yml#/components/schemas/OpenSanctionsDatasetFreshnessDto
 OpenSanctionsUpstreamDatasetFreshnessDto:
   $ref: screenings.yml#/components/schemas/OpenSanctionsUpstreamDatasetFreshnessDto
 OpenSanctionsCatalogDto:
   $ref: screenings.yml#/components/schemas/OpenSanctionsCatalogDto
+ScreeningConfigBodySectionDto:
+  $ref: screenings.yml#/components/schemas/ScreeningConfigBodySectionDto
+ScreeningConfigBodyFiltersDto:
+  $ref: screenings.yml#/components/schemas/ScreeningConfigBodyFiltersDto
 ScreeningConfigDto:
   $ref: screenings.yml#/components/schemas/ScreeningConfigDto
 ScreeningDto:
diff --git a/packages/marble-api/openapis/marblecore-api/admin.yml b/packages/marble-api/openapis/marblecore-api/admin.yml
index 3677e42b9..e7fa2783d 100644
--- a/packages/marble-api/openapis/marblecore-api/admin.yml
+++ b/packages/marble-api/openapis/marblecore-api/admin.yml
@@ -594,6 +594,18 @@ components:
         sentry_replay_enabled:
           type: boolean
           description: Whether Sentry session replay is enabled for this organization
+        screening_providers:
+          type: object
+          properties:
+            transaction_monitoring:
+              type: string
+              enum: [opensanctions, lexisnexis]
+            continuous_monitoring:
+              type: string
+              enum: [opensanctions, lexisnexis]
+            manual_search:
+              type: string
+              enum: [opensanctions, lexisnexis]
     CreateOrganizationBodyDto:
       type: object
       required:
@@ -612,6 +624,18 @@ components:
           type: number
         auto_assign_queue_limit:
           type: number
+        screening_providers:
+          type: object
+          properties:
+            transaction_monitoring:
+              type: string
+              enum: [opensanctions, lexisnexis]
+            continuous_monitoring:
+              type: string
+              enum: [opensanctions, lexisnexis]
+            manual_search:
+              type: string
+              enum: [opensanctions, lexisnexis]
     OrganizationSubnetsDto:
       type: object
       properties:
diff --git a/packages/marble-api/openapis/marblecore-api/continuous-screenings.yml b/packages/marble-api/openapis/marblecore-api/continuous-screenings.yml
index 234429f62..3b48c0bc0 100644
--- a/packages/marble-api/openapis/marblecore-api/continuous-screenings.yml
+++ b/packages/marble-api/openapis/marblecore-api/continuous-screenings.yml
@@ -335,7 +335,6 @@ components:
           items:
             $ref: '#/components/schemas/ContinuousScreeningMappingFieldDto'
 
-
     CreateContinuousScreeningConfigDto:
       type: object
       required:
@@ -360,6 +359,8 @@ components:
           minItems: 1
           items:
             type: string
+        filters:
+          $ref: 'screenings.yml#/components/schemas/ScreeningConfigBodyFiltersDto'
         match_threshold:
           type: integer
           minimum: 0
diff --git a/packages/marble-api/openapis/marblecore-api/screenings.yml b/packages/marble-api/openapis/marblecore-api/screenings.yml
index 5d67c496d..cf6d70f2d 100644
--- a/packages/marble-api/openapis/marblecore-api/screenings.yml
+++ b/packages/marble-api/openapis/marblecore-api/screenings.yml
@@ -34,6 +34,27 @@
           application/json:
             schema:
               $ref: '#/components/schemas/OpenSanctionsCatalogDto'
+/screenings/available-filters:
+  get:
+    tags:
+      - Screening
+    summary: List available filter for the current provider
+    operationId: listScreeningAvailableFilters
+    parameters:
+      - name: feature
+        description: Feature the return the filters for
+        in: query
+        required: true
+        schema:
+          type: string
+          enum: [transaction_monitoring, continuous_monitoring, manual_search]
+    responses:
+      '200':
+        description: Available filters
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ScreeningAvailableFilters'
 /screenings/freshness:
   get:
     tags:
@@ -379,6 +400,79 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/OpenSanctionsCatalogSection'
+    ScreeningAvailableFilters:
+      type: object
+      required: [provider, sections]
+      properties:
+        provider:
+          type: string
+          enum: [opensanctions, lexisnexis]
+        sections:
+          type: object
+          properties:
+            sanctions:
+              $ref: '#/components/schemas/ScreeningAvailableFiltersSection'
+            peps:
+              $ref: '#/components/schemas/ScreeningAvailableFiltersSection'
+            adverse_media:
+              $ref: '#/components/schemas/ScreeningAvailableFiltersSection'
+            other:
+              $ref: '#/components/schemas/ScreeningAvailableFiltersSection'
+    ScreeningAvailableFiltersSection:
+      type: object
+      properties:
+        datasets:
+          type: array
+          items:
+            type: object
+            required: [name, title]
+            properties:
+              section:
+                type: string
+              name:
+                type: string
+              title:
+                type: string
+        topics:
+          type: object
+          additionalProperties:
+            type: array
+            items:
+              type: object
+              required: [name, title]
+              properties: 
+                name:
+                  type: string
+                title:
+                  type: string
+        enabled:
+          type: boolean
+    ScreeningConfigBodySectionDto:
+      type: object
+      properties:
+        enabled:
+          type: boolean
+        datasets:
+          type: array
+          items:
+            type: string
+        topics:
+          type: object
+          additionalProperties:
+            type: array
+            items:
+              type: string
+    ScreeningConfigBodyFiltersDto:
+      type: object
+      properties:
+        sanctions:
+          $ref: '#/components/schemas/ScreeningConfigBodySectionDto'
+        peps:
+          $ref: '#/components/schemas/ScreeningConfigBodySectionDto'
+        adverse_media:
+          $ref: '#/components/schemas/ScreeningConfigBodySectionDto'
+        other:
+          $ref: '#/components/schemas/ScreeningConfigBodySectionDto'
     OpenSanctionsDatasetFreshnessDto:
       type: object
       required:
@@ -422,6 +516,8 @@ components:
           type: array
           items:
             type: string
+        filters:
+          $ref: '#/components/schemas/ScreeningConfigBodyFiltersDto'
         threshold:
           type: integer
           minimum: 0
diff --git a/packages/marble-api/src/generated/marblecore-api.ts b/packages/marble-api/src/generated/marblecore-api.ts
index 5c958b36b..8a49972fe 100644
--- a/packages/marble-api/src/generated/marblecore-api.ts
+++ b/packages/marble-api/src/generated/marblecore-api.ts
@@ -870,12 +870,26 @@ export type ScenarioIterationDto = {
     updated_at: string;
     archived: boolean;
 };
+export type ScreeningConfigBodySectionDto = {
+    enabled?: boolean;
+    datasets?: string[];
+    topics?: {
+        [key: string]: string[];
+    };
+};
+export type ScreeningConfigBodyFiltersDto = {
+    sanctions?: ScreeningConfigBodySectionDto;
+    peps?: ScreeningConfigBodySectionDto;
+    adverse_media?: ScreeningConfigBodySectionDto;
+    other?: ScreeningConfigBodySectionDto;
+};
 export type ScreeningConfigDto = {
     id?: string;
     name?: string;
     description?: string;
     rule_group?: string;
     datasets?: string[];
+    filters?: ScreeningConfigBodyFiltersDto;
     threshold?: number;
     forced_outcome?: OutcomeDto;
     trigger_rule?: NodeDto;
@@ -1077,6 +1091,29 @@ export type OpenSanctionsCatalogSection = {
 export type OpenSanctionsCatalogDto = {
     sections: OpenSanctionsCatalogSection[];
 };
+export type ScreeningAvailableFiltersSection = {
+    datasets?: {
+        section?: string;
+        name: string;
+        title: string;
+    }[];
+    topics?: {
+        [key: string]: {
+            name: string;
+            title: string;
+        }[];
+    };
+    enabled?: boolean;
+};
+export type ScreeningAvailableFilters = {
+    provider: "opensanctions" | "lexisnexis";
+    sections: {
+        sanctions?: ScreeningAvailableFiltersSection;
+        peps?: ScreeningAvailableFiltersSection;
+        adverse_media?: ScreeningAvailableFiltersSection;
+        other?: ScreeningAvailableFiltersSection;
+    };
+};
 export type ScreeningFileDto = {
     id: string;
     filename: string;
@@ -1154,6 +1191,7 @@ export type CreateContinuousScreeningConfigDto = {
     inbox_id: string;
     algorithm?: string;
     datasets: string[];
+    filters?: ScreeningConfigBodyFiltersDto;
     match_threshold: number;
     match_limit: number;
     object_types: string[];
@@ -1604,6 +1642,11 @@ export type OrganizationDto = {
     allowed_networks: string[];
     /** Whether Sentry session replay is enabled for this organization */
     sentry_replay_enabled?: boolean;
+    screening_providers?: {
+        transaction_monitoring?: "opensanctions" | "lexisnexis";
+        continuous_monitoring?: "opensanctions" | "lexisnexis";
+        manual_search?: "opensanctions" | "lexisnexis";
+    };
 };
 export type CreateOrganizationBodyDto = {
     name: string;
@@ -1613,6 +1656,11 @@ export type UpdateOrganizationBodyDto = {
     sanctions_threshold?: number;
     sanctions_limit?: number;
     auto_assign_queue_limit?: number;
+    screening_providers?: {
+        transaction_monitoring?: "opensanctions" | "lexisnexis";
+        continuous_monitoring?: "opensanctions" | "lexisnexis";
+        manual_search?: "opensanctions" | "lexisnexis";
+    };
 };
 export type OrganizationSubnetsDto = {
     /** List of CIDR subnets (x.x.x.x/yy) */
@@ -3907,6 +3955,19 @@ export function listOpenSanctionDatasets(opts?: Oazapfts.RequestOpts) {
         ...opts
     }));
 }
+/**
+ * List available filter for the current provider
+ */
+export function listScreeningAvailableFilters(feature: "transaction_monitoring" | "continuous_monitoring" | "manual_search", opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: ScreeningAvailableFilters;
+    }>(`/screenings/available-filters${QS.query(QS.explode({
+        feature
+    }))}`, {
+        ...opts
+    }));
+}
 /**
  * List files for screening
  */
diff --git a/packages/ui-design-system/src/Checkbox/Checkbox.tsx b/packages/ui-design-system/src/Checkbox/Checkbox.tsx
index 095b54c00..52afab4a2 100644
--- a/packages/ui-design-system/src/Checkbox/Checkbox.tsx
+++ b/packages/ui-design-system/src/Checkbox/Checkbox.tsx
@@ -44,8 +44,12 @@ export const Checkbox = forwardRef<
     color?: 'purple' | 'red';
     circle?: boolean;
     size?: 'small' | 'default';
+    stopPropagation?: boolean;
   }
->(function Checkbox({ className, color = 'purple', circle, checked, size = 'default', ...props }, ref) {
+>(function Checkbox(
+  { className, color = 'purple', circle, checked, size = 'default', stopPropagation = false, onClick, ...props },
+  ref,
+) {
   return (
     <Root
       ref={ref}
@@ -53,6 +57,10 @@ export const Checkbox = forwardRef<
       className={checkbox({ color, circle, size, className: `group ${className}` })}
       checked={checked}
       {...props}
+      onClick={(e) => {
+        if (stopPropagation) e.stopPropagation();
+        onClick?.(e);
+      }}
     >
       <Indicator asChild>
         {checked === undefined ? (
diff --git a/packages/ui-design-system/src/Collapsible/Collapsible.tsx b/packages/ui-design-system/src/Collapsible/Collapsible.tsx
index d7039ed6b..53166899b 100644
--- a/packages/ui-design-system/src/Collapsible/Collapsible.tsx
+++ b/packages/ui-design-system/src/Collapsible/Collapsible.tsx
@@ -32,6 +32,7 @@ const collapsibleTitle = cva('group flex cursor-pointer items-center justify-bet
     size: {
       default: 'p-4 lg:p-6',
       small: 'p-4',
+      null: 'p-0',
     },
   },
   defaultVariants: {
@@ -41,25 +42,24 @@ const collapsibleTitle = cva('group flex cursor-pointer items-center justify-bet
 
 export type CollapsibleTriggerProps = VariantProps<typeof collapsibleTitle> & RadixCollapsibleProps;
 
-const CollapsibleTitle = forwardRef<HTMLButtonElement, CollapsibleTriggerProps>(function CollapsibleTitle(
-  { className, children, size, ...props },
-  ref,
-) {
-  return (
-    <Trigger ref={ref} className={collapsibleTitle({ size, className })} asChild {...props}>
-      <div className="focus-within:outline-2 focus-within:-outline-offset-2 focus-within:outline-purple-primary">
-        {children}
-        <button>
-          <Icon
-            icon="smallarrow-up"
-            aria-hidden
-            className="border-grey-border group-radix-state-open:rotate-180 size-6 rounded-sm border transition-transform duration-200"
-          />
-        </button>
-      </div>
-    </Trigger>
-  );
-});
+const CollapsibleTitle = forwardRef<HTMLButtonElement, CollapsibleTriggerProps & { hideIcon?: boolean }>(
+  function CollapsibleTitle({ className, children, size, hideIcon = false, ...props }, ref) {
+    return (
+      <Trigger ref={ref} className={collapsibleTitle({ size, className })} asChild {...props}>
+        <div className="focus-within:outline-2 focus-within:-outline-offset-2 focus-within:outline-purple-primary">
+          {children}
+          {!hideIcon && (
+            <Icon
+              icon="smallarrow-up"
+              aria-hidden
+              className="border-grey-border group-radix-state-open:rotate-180 size-6 rounded-sm border transition-transform duration-200"
+            />
+          )}
+        </div>
+      </Trigger>
+    );
+  },
+);
 
 const content =
   'border-grey-border border-t radix-state-open:animate-slide-down radix-state-closed:animate-slide-up overflow-hidden';
diff --git a/packages/ui-design-system/src/Tabs/Tabs.stories.tsx b/packages/ui-design-system/src/Tabs/Tabs.stories.tsx
index f4263354f..04bcef7f4 100644
--- a/packages/ui-design-system/src/Tabs/Tabs.stories.tsx
+++ b/packages/ui-design-system/src/Tabs/Tabs.stories.tsx
@@ -1,6 +1,6 @@
 import { type Meta, type StoryFn } from '@storybook/react';
 import { useState } from 'react';
-
+import { capitalize } from 'remeda';
 import { Tabs, tabClassName } from './Tabs';
 
 const Story: Meta<typeof Tabs> = {
@@ -24,7 +24,7 @@ export const Default: StoryFn<typeof Tabs> = () => {
             data-status={activeTab === tab ? 'active' : undefined}
             onClick={() => setActiveTab(tab)}
           >
-            {tab.charAt(0).toUpperCase() + tab.slice(1)}
+            {capitalize(tab)}
           </button>
         ))}
       </Tabs>