diff --git a/app/layout/project/sidebar/scenario/grid-setup/features/modals/split/index.tsx b/app/layout/project/sidebar/scenario/grid-setup/features/modals/split/index.tsx
index ef9b8d4040..839c3b80a0 100644
--- a/app/layout/project/sidebar/scenario/grid-setup/features/modals/split/index.tsx
+++ b/app/layout/project/sidebar/scenario/grid-setup/features/modals/split/index.tsx
@@ -91,7 +91,7 @@ const SplitModal = ({
 
       selectedFeaturesMutation.mutate(
         {
-          id: `${sid}`,
+          id: sid,
           data: {
             status: 'draft',
             features: selectedFeaturesQuery.data.map((sf) => {
@@ -204,7 +204,10 @@ const SplitModal = ({
                           clearSelectionLabel="Clear selection"
                           selected={values.splitOption}
                           options={SPLIT_OPTIONS}
-                          onChange={fprops.input.onChange}
+                          onChange={(v) => {
+                            fprops.input.onChange(v);
+                            setSplitFeaturesSelected([]);
+                          }}
                         />
                       </div>
                     </Field>
@@ -223,7 +226,7 @@ const SplitModal = ({
                               (sfs) => sfs.id === `${value.name}`
                             );
                             return (
-                              <div key={value.name} className="flex items-center space-x-2.5">
+                              <div key={value.name} className="flex items-center space-x-2.5 pl-1">
                                 <Checkbox
                                   id={`checkbox-${value.name}`}
                                   value={`${value.name}`}
diff --git a/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/index.tsx b/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/index.tsx
index 835aafbe81..c4bdd0a11d 100644
--- a/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/index.tsx
+++ b/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/index.tsx
@@ -98,7 +98,7 @@ const TargetsSPFTable = ({
             <tbody className="block h-full divide-y divide-gray-600 py-2 align-baseline text-sm">
               {data.map((item) => (
                 <RowItem
-                  key={item.id}
+                  key={item.splitted ? `${item.id}-${item.value}` : `${item.id}`}
                   item={item}
                   selectedIds={selectedIds}
                   onSelectRow={onSelectRow}
diff --git a/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/row-item/index.tsx b/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/row-item/index.tsx
index 9592aa39f4..bacc83c8eb 100644
--- a/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/row-item/index.tsx
+++ b/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/row-item/index.tsx
@@ -80,7 +80,7 @@ const RowItem = ({
         })}
       >
         <span className="inline-flex">{name}</span>
-        {isCustom && scenarioUsageCount && (
+        {Boolean(isCustom && scenarioUsageCount) && (
           <div className="mt-1.5 text-xs text-gray-400">
             Currently in use in{' '}
             <span className="rounded bg-blue-600 bg-opacity-10 px-1 text-blue-600">
diff --git a/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/types.ts b/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/types.ts
index 06e024c841..bd33d51a84 100644
--- a/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/types.ts
+++ b/app/layout/project/sidebar/scenario/grid-setup/features/target-spf/targets-spf-table/types.ts
@@ -12,6 +12,7 @@ export type DataItem = {
   isVisibleOnMap: boolean;
   isCustom?: boolean;
   type: Feature['tag'];
+  splitted: boolean;
   marxanSettings: Record<'prop' | 'spf', number>;
   splitOptions: { key: string; label: string; values: { id: string; name: string }[] }[];
   value?: string;