diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 4ebce02d9d..5fbb1f9a99 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -190,6 +190,7 @@ describe('Data mapping', () => {
 
 		ndv.actions.executePrevious();
 
+		ndv.getters.schemaViewNode().contains('Schedule').click();
 		const dataPill = ndv.getters
 			.inputDataContainer()
 			.findChildByTestId('run-data-schema-item')
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index d5b09c15dd..caa2ead737 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -150,8 +150,7 @@ export class NDV extends BasePage {
 		nodeRunErrorDescription: () => cy.getByTestId('node-error-description'),
 		fixedCollectionParameter: (paramName: string) =>
 			cy.getByTestId(`fixed-collection-${paramName}`),
-		schemaViewNode: () => cy.getByTestId('run-data-schema-node'),
-		schemaViewNodeName: () => cy.getByTestId('run-data-schema-node-name'),
+		schemaViewNode: () => cy.getByTestId('run-data-schema-header'),
 		expressionExpanders: () => cy.getByTestId('expander'),
 		expressionModalOutput: () => cy.getByTestId('expression-modal-output'),
 		floatingNodes: () => cy.getByTestId('floating-node'),
diff --git a/packages/frontend/editor-ui/src/components/NodeDetailsView.vue b/packages/frontend/editor-ui/src/components/NodeDetailsView.vue
index bb53706673..7c334f1b35 100644
--- a/packages/frontend/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/frontend/editor-ui/src/components/NodeDetailsView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, onMounted, onBeforeUnmount, computed, watch } from 'vue';
 import { createEventBus } from '@n8n/utils/event-bus';
-import type { IRunData, Workflow, NodeConnectionType } from 'n8n-workflow';
+import type { IRunData, Workflow, NodeConnectionType, IConnectedNode } from 'n8n-workflow';
 import { jsonParse, NodeHelpers, NodeConnectionTypes } from 'n8n-workflow';
 import type { IUpdateInformation, TargetItem } from '@/Interface';
 
@@ -130,24 +130,19 @@ const workflowRunData = computed(() => {
 
 const parentNodes = computed(() => {
 	if (activeNode.value) {
-		return (
-			props.workflowObject
-				.getParentNodesByDepth(activeNode.value.name, 1)
-				.map(({ name }) => name) || []
-		);
-	} else {
-		return [];
+		return props.workflowObject.getParentNodesByDepth(activeNode.value.name, 1);
 	}
+	return [];
 });
 
-const parentNode = computed(() => {
-	for (const parentNodeName of parentNodes.value) {
-		if (workflowsStore?.pinnedWorkflowData?.[parentNodeName]) {
-			return parentNodeName;
+const parentNode = computed<IConnectedNode | undefined>(() => {
+	for (const parent of parentNodes.value) {
+		if (workflowsStore?.pinnedWorkflowData?.[parent.name]) {
+			return parent;
 		}
 
-		if (workflowRunData.value?.[parentNodeName]) {
-			return parentNodeName;
+		if (workflowRunData.value?.[parent.name]) {
+			return parent;
 		}
 	}
 	return parentNodes.value[0];
@@ -177,7 +172,7 @@ const inputNodeName = computed<string | undefined>(() => {
 		)?.[0];
 		return connectedOutputNode;
 	}
-	return selectedInput.value || parentNode.value;
+	return selectedInput.value ?? parentNode.value?.name;
 });
 
 const inputNode = computed(() => {
@@ -290,12 +285,23 @@ const maxInputRun = computed(() => {
 	return 0;
 });
 
+const connectedCurrentNodeOutputs = computed(() => {
+	return parentNodes.value.find(({ name }) => name === inputNodeName.value)?.indicies;
+});
+
 const inputRun = computed(() => {
 	if (isLinkingEnabled.value && maxOutputRun.value === maxInputRun.value) {
 		return outputRun.value;
 	}
-	if (runInputIndex.value === -1) {
-		return maxInputRun.value;
+	const currentInputNodeName = inputNodeName.value;
+	if (runInputIndex.value === -1 && currentInputNodeName) {
+		return (
+			connectedCurrentNodeOutputs.value
+				?.map((outputIndex) =>
+					nodeHelpers.getLastRunIndexWithData(currentInputNodeName, outputIndex),
+				)
+				.find((runIndex) => runIndex !== -1) ?? maxInputRun.value
+		);
 	}
 
 	return Math.min(runInputIndex.value, maxInputRun.value);
diff --git a/packages/frontend/editor-ui/src/components/RunData.vue b/packages/frontend/editor-ui/src/components/RunData.vue
index 0aca96344d..00d45cd764 100644
--- a/packages/frontend/editor-ui/src/components/RunData.vue
+++ b/packages/frontend/editor-ui/src/components/RunData.vue
@@ -262,9 +262,8 @@ const nodeType = computed(() => {
 
 const isSchemaView = computed(() => displayMode.value === 'schema');
 const isSearchInSchemaView = computed(() => isSchemaView.value && !!search.value);
-const displaysMultipleNodes = computed(
-	() => isSchemaView.value && props.paneType === 'input' && props.nodes.length > 0,
-);
+const hasMultipleInputNodes = computed(() => props.paneType === 'input' && props.nodes.length > 0);
+const displaysMultipleNodes = computed(() => isSchemaView.value && hasMultipleInputNodes.value);
 
 const isTriggerNode = computed(() => !!node.value && nodeTypesStore.isTriggerNode(node.value.type));
 
@@ -478,7 +477,10 @@ const isPaneTypeOutput = computed(() => props.paneType === 'output');
 
 const readOnlyEnv = computed(() => sourceControlStore.preferences.branchReadOnly);
 const showIOSearch = computed(
-	() => hasNodeRun.value && !hasRunError.value && unfilteredInputData.value.length > 0,
+	() =>
+		hasNodeRun.value &&
+		!hasRunError.value &&
+		(unfilteredInputData.value.length > 0 || displaysMultipleNodes.value),
 );
 const inputSelectLocation = computed(() => {
 	if (isSchemaView.value) return 'none';
@@ -492,7 +494,8 @@ const inputSelectLocation = computed(() => {
 });
 
 const showIoSearchNoMatchContent = computed(
-	() => hasNodeRun.value && !inputData.value.length && !!search.value,
+	() =>
+		hasNodeRun.value && !inputData.value.length && !!search.value && !displaysMultipleNodes.value,
 );
 
 const parentNodeOutputData = computed(() => {
@@ -565,7 +568,7 @@ const hasInputOverwrite = computed((): boolean => {
 	if (!node.value) {
 		return false;
 	}
-	const taskData = nodeHelpers.getNodeTaskData(node.value, props.runIndex);
+	const taskData = nodeHelpers.getNodeTaskData(node.value.name, props.runIndex);
 	return Boolean(taskData?.inputOverride);
 });
 
@@ -1395,7 +1398,9 @@ defineExpose({ enterEditMode });
 				<RunDataDisplayModeSelect
 					v-show="
 						hasPreviewSchema ||
-						(hasNodeRun && (inputData.length || binaryData.length || search) && !editMode.enabled)
+						(hasNodeRun &&
+							(inputData.length || binaryData.length || search || hasMultipleInputNodes) &&
+							!editMode.enabled)
 					"
 					:class="$style.displayModeSelect"
 					:compact="props.compact"
@@ -1679,7 +1684,10 @@ defineExpose({ enterEditMode });
 
 			<div
 				v-else-if="
-					hasNodeRun && (!unfilteredDataCount || (search && !dataCount)) && branches.length > 1
+					hasNodeRun &&
+					(!unfilteredDataCount || (search && !dataCount)) &&
+					!displaysMultipleNodes &&
+					branches.length > 1
 				"
 				:class="$style.center"
 			>
@@ -1700,7 +1708,10 @@ defineExpose({ enterEditMode });
 				</N8nText>
 			</div>
 
-			<div v-else-if="hasNodeRun && !inputData.length && !search" :class="$style.center">
+			<div
+				v-else-if="hasNodeRun && !inputData.length && !displaysMultipleNodes && !search"
+				:class="$style.center"
+			>
 				<slot name="no-output-data">xxx</slot>
 			</div>
 
@@ -1816,9 +1827,7 @@ defineExpose({ enterEditMode });
 					:data="jsonData"
 					:pane-type="paneType"
 					:connection-type="connectionType"
-					:run-index="runIndex"
 					:output-index="currentOutputIndex"
-					:total-runs="maxRunIndex"
 					:search="search"
 					:class="$style.schema"
 					:compact="props.compact"
diff --git a/packages/frontend/editor-ui/src/components/VirtualSchema.test.ts b/packages/frontend/editor-ui/src/components/VirtualSchema.test.ts
index 8f7a23fc73..cb0173eacd 100644
--- a/packages/frontend/editor-ui/src/components/VirtualSchema.test.ts
+++ b/packages/frontend/editor-ui/src/components/VirtualSchema.test.ts
@@ -106,6 +106,7 @@ async function setupStore() {
 	const workflowsStore = useWorkflowsStore();
 	const nodeTypesStore = useNodeTypesStore();
 	const settingsStore = useSettingsStore();
+	const ndvStore = useNDVStore();
 	settingsStore.setSettings(defaultSettings);
 
 	nodeTypesStore.setNodeTypes([
@@ -124,6 +125,7 @@ async function setupStore() {
 		}),
 	]);
 	workflowsStore.workflow = workflow as IWorkflowDb;
+	ndvStore.activeNodeName = 'Test Node Name';
 
 	return pinia;
 }
@@ -133,6 +135,8 @@ function mockNodeOutputData(nodeName: string, data: INodeExecutionData[], output
 	vi.spyOn(nodeHelpers, 'useNodeHelpers').mockImplementation(() => {
 		return {
 			...originalNodeHelpers,
+			getLastRunIndexWithData: vi.fn(() => 0),
+			hasNodeExecuted: vi.fn(() => true),
 			getNodeInputData: vi.fn((node, _, output) => {
 				if (node.name === nodeName && output === outputIndex) {
 					return data;
@@ -168,6 +172,8 @@ describe('VirtualSchema.vue', () => {
 		cleanup();
 		vi.resetAllMocks();
 		vi.setSystemTime('2025-01-01');
+		const pinia = await setupStore();
+
 		renderComponent = createComponentRenderer(VirtualSchema, {
 			global: {
 				stubs: {
@@ -177,12 +183,9 @@ describe('VirtualSchema.vue', () => {
 					Notice: NoticeStub,
 				},
 			},
-			pinia: await setupStore(),
+			pinia,
 			props: {
 				mappingEnabled: true,
-				runIndex: 1,
-				outputIndex: 0,
-				totalRuns: 2,
 				paneType: 'input',
 				connectionType: 'main',
 				search: '',
@@ -192,13 +195,9 @@ describe('VirtualSchema.vue', () => {
 	});
 
 	it('renders schema for empty data for unexecuted nodes', async () => {
-		const { getAllByText, getAllByTestId } = renderComponent();
+		const { getAllByText } = renderComponent();
 
-		await waitFor(() => expect(getAllByText('Execute previous nodes').length).toBe(2));
-
-		// Collapse second node
-		await userEvent.click(getAllByTestId('run-data-schema-header')[1]);
-		expect(getAllByText('Execute previous nodes').length).toBe(1);
+		await waitFor(() => expect(getAllByText('Execute previous nodes').length).toBe(1));
 	});
 
 	it('renders schema for empty data with binary', async () => {
@@ -320,7 +319,9 @@ describe('VirtualSchema.vue', () => {
 
 		const { getAllByText } = renderComponent({ props: { paneType: 'output' } });
 		await waitFor(() =>
-			expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(1),
+			expect(
+				getAllByText('No fields - node executed, but no items were sent on this branch').length,
+			).toBe(1),
 		);
 	});
 
@@ -352,7 +353,6 @@ describe('VirtualSchema.vue', () => {
 			const headers = getAllByTestId('run-data-schema-header');
 			expect(headers[0]).toHaveTextContent('If');
 			expect(headers[0]).toHaveTextContent('2 items');
-			expect(headers[0]).toMatchSnapshot();
 		});
 	});
 
@@ -434,7 +434,10 @@ describe('VirtualSchema.vue', () => {
 			},
 		});
 
-		await waitFor(() => expect(getAllByTestId('run-data-schema-item').length).toBe(2));
+		await waitFor(() => {
+			expect(getAllByTestId('run-data-schema-header')).toHaveLength(3);
+			expect(getAllByTestId('run-data-schema-item').length).toBe(1);
+		});
 	});
 
 	it('should show connections', async () => {
@@ -564,30 +567,27 @@ describe('VirtualSchema.vue', () => {
 			data: [{ json: { name: 'John' } }],
 		});
 
-		const { getAllByTestId, queryAllByTestId, rerender } = renderComponent();
+		const { getAllByTestId, queryAllByTestId, rerender, container } = renderComponent();
 
 		let headers: HTMLElement[] = [];
 		await waitFor(async () => {
 			headers = getAllByTestId('run-data-schema-header');
 			expect(headers.length).toBe(3);
-			expect(getAllByTestId('run-data-schema-item').length).toBe(2);
+			expect(getAllByTestId('run-data-schema-item').length).toBe(1);
 		});
 
-		// Collapse all nodes (Variables & context is collapsed by default)
-		await Promise.all(headers.slice(0, -1).map(async (header) => await userEvent.click(header)));
+		// Collapse first node (expanded by default)
+		await userEvent.click(headers[0]);
 
 		expect(queryAllByTestId('run-data-schema-item').length).toBe(0);
 
 		await rerender({ search: 'John' });
 
-		expect(getAllByTestId('run-data-schema-item').length).toBe(13);
+		expect(getAllByTestId('run-data-schema-item').length).toBe(2);
+		expect(container).toMatchSnapshot();
 	});
 
 	it('renders preview schema when enabled and available', async () => {
-		useWorkflowsStore().pinData({
-			node: mockNode1,
-			data: [],
-		});
 		useWorkflowsStore().pinData({
 			node: mockNode2,
 			data: [],
@@ -611,14 +611,18 @@ describe('VirtualSchema.vue', () => {
 			}),
 		);
 
-		const { getAllByTestId, queryAllByText, container } = renderComponent({});
-
-		await waitFor(() => {
-			expect(getAllByTestId('run-data-schema-header')).toHaveLength(3);
+		const { getAllByTestId, queryAllByText, container } = renderComponent({
+			props: {
+				nodes: [{ name: mockNode2.name, indicies: [], depth: 1 }],
+			},
 		});
 
+		await waitFor(() => {
+			expect(getAllByTestId('run-data-schema-header')).toHaveLength(2);
+		});
+
+		expect(getAllByTestId('schema-preview-warning')).toHaveLength(1);
 		expect(queryAllByText("No fields - item(s) exist, but they're empty")).toHaveLength(0);
-		expect(getAllByTestId('schema-preview-warning')).toHaveLength(2);
 		expect(container).toMatchSnapshot();
 	});
 
diff --git a/packages/frontend/editor-ui/src/components/VirtualSchema.vue b/packages/frontend/editor-ui/src/components/VirtualSchema.vue
index 2a46772e88..8c4d93e086 100644
--- a/packages/frontend/editor-ui/src/components/VirtualSchema.vue
+++ b/packages/frontend/editor-ui/src/components/VirtualSchema.vue
@@ -56,9 +56,6 @@ type Props = {
 	node?: INodeUi | null;
 	data?: IDataObject[];
 	mappingEnabled?: boolean;
-	runIndex?: number;
-	outputIndex?: number;
-	totalRuns?: number;
 	paneType: 'input' | 'output';
 	connectionType?: NodeConnectionType;
 	search?: string;
@@ -70,9 +67,6 @@ const props = withDefaults(defineProps<Props>(), {
 	distanceFromActive: 1,
 	node: null,
 	data: () => [],
-	runIndex: 0,
-	outputIndex: 0,
-	totalRuns: 1,
 	connectionType: NodeConnectionTypes.Main,
 	search: '',
 	mappingEnabled: false,
@@ -91,20 +85,24 @@ const posthogStore = usePostHog();
 
 const { getSchemaForExecutionData, getSchemaForJsonSchema, getSchema, filterSchema } =
 	useDataSchema();
-const { closedNodes, flattenSchema, flattenMultipleSchemas, toggleLeaf, toggleNode } =
-	useFlattenSchema();
-const { getNodeInputData, getNodeTaskData } = useNodeHelpers();
+const { closedNodes, flattenSchema, flattenMultipleSchemas, toggleNode } = useFlattenSchema();
+const { getNodeInputData, getLastRunIndexWithData, hasNodeExecuted } = useNodeHelpers();
 
 const emit = defineEmits<{
 	'clear:search': [];
 }>();
 
 const scroller = ref<RecycleScrollerInstance>();
+const closedNodesBeforeSearch = ref(new Set<string>());
 
 const canDraggableDrop = computed(() => ndvStore.canDraggableDrop);
 const draggableStickyPosition = computed(() => ndvStore.draggableStickyPos);
 
-const toggleNodeAndScrollTop = (id: string) => {
+const toggleNodeExclusiveAndScrollTop = (id: string) => {
+	const isClosed = closedNodes.value.has(id);
+	if (isClosed) {
+		closedNodes.value = new Set(items.value.map((item) => item.id));
+	}
 	toggleNode(id);
 	scroller.value?.scrollToItem(0);
 };
@@ -112,13 +110,23 @@ const toggleNodeAndScrollTop = (id: string) => {
 const getNodeSchema = async (fullNode: INodeUi, connectedNode: IConnectedNode) => {
 	const pinData = workflowsStore.pinDataByNodeName(connectedNode.name);
 	const hasPinnedData = pinData ? pinData.length > 0 : false;
-	const isNodeExecuted = getNodeTaskData(fullNode, props.runIndex) !== null || hasPinnedData;
+	const isNodeExecuted = hasPinnedData || hasNodeExecuted(connectedNode.name);
+
 	const connectedOutputIndexes = connectedNode.indicies.length > 0 ? connectedNode.indicies : [0];
-	const nodeData = connectedOutputIndexes.map((outputIndex) =>
-		getNodeInputData(fullNode, props.runIndex, outputIndex, props.paneType, props.connectionType),
-	);
-	const hasBinary = nodeData.flat().some((data) => !isEmpty(data.binary));
-	const data = pinData ?? nodeData.map(executionDataToJson).flat();
+	const connectedOutputsWithData = connectedOutputIndexes
+		.map((outputIndex) => ({
+			outputIndex,
+			runIndex: getLastRunIndexWithData(fullNode.name, outputIndex, props.connectionType),
+		}))
+		.filter(({ runIndex }) => runIndex !== -1);
+	const nodeData = connectedOutputsWithData
+		.map(({ outputIndex, runIndex }) =>
+			getNodeInputData(fullNode, runIndex, outputIndex, props.paneType, props.connectionType),
+		)
+		.flat();
+	const hasBinary = nodeData.some((data) => !isEmpty(data.binary));
+	const data = pinData ?? executionDataToJson(nodeData);
+	const isDataEmpty = data.length === 0;
 
 	let schema = getSchemaForExecutionData(data);
 	let preview = false;
@@ -135,9 +143,11 @@ const getNodeSchema = async (fullNode: INodeUi, connectedNode: IConnectedNode) =
 		schema,
 		connectedOutputIndexes,
 		itemsCount: data.length,
+		runIndex: connectedOutputsWithData[0]?.runIndex ?? 0,
 		preview,
 		hasBinary,
 		isNodeExecuted,
+		isDataEmpty,
 	};
 };
 
@@ -164,7 +174,7 @@ const contextSchema = computed(() => {
 		$workflow: pick(workflowsStore.workflow, ['id', 'name', 'active']),
 	};
 
-	return getSchema(schemaSource);
+	return filterSchema(getSchema(schemaSource), props.search);
 });
 
 const contextItems = computed(() => {
@@ -178,10 +188,13 @@ const contextItems = computed(() => {
 
 	if (closedNodes.value.has(header.id)) return [header];
 
-	const fields: Renders[] = flattenSchema({
-		schema: contextSchema.value,
-		depth: 1,
-	}).flatMap((renderItem) => {
+	const schema = contextSchema.value;
+
+	if (!schema) {
+		return [];
+	}
+
+	const fields: Renders[] = flattenSchema({ schema, depth: 1 }).flatMap((renderItem) => {
 		const isVars =
 			renderItem.type === 'item' && renderItem.depth === 1 && renderItem.title === '$vars';
 
@@ -252,8 +265,16 @@ const nodesSchemas = asyncComputed<SchemaNode[]>(async () => {
 		const nodeType = nodeTypesStore.getNodeType(fullNode.type, fullNode.typeVersion);
 		if (!nodeType) continue;
 
-		const { schema, connectedOutputIndexes, itemsCount, preview, hasBinary, isNodeExecuted } =
-			await getNodeSchema(fullNode, node);
+		const {
+			schema,
+			connectedOutputIndexes,
+			itemsCount,
+			preview,
+			hasBinary,
+			isNodeExecuted,
+			isDataEmpty,
+			runIndex,
+		} = await getNodeSchema(fullNode, node);
 
 		const filteredSchema = filterSchema(schema, search);
 
@@ -269,6 +290,8 @@ const nodesSchemas = asyncComputed<SchemaNode[]>(async () => {
 			preview,
 			hasBinary,
 			isNodeExecuted,
+			isDataEmpty,
+			runIndex,
 		});
 	}
 
@@ -319,25 +342,28 @@ const noSearchResults = computed(() => {
 });
 
 watch(
-	() => props.search,
-	(newSearch) => {
-		if (!newSearch) return;
-		closedNodes.value.clear();
+	() => Boolean(props.search),
+	(hasSearch) => {
+		if (hasSearch) {
+			closedNodesBeforeSearch.value = new Set(closedNodes.value);
+			closedNodes.value.clear();
+		} else if (closedNodes.value.size === 0) {
+			closedNodes.value = closedNodesBeforeSearch.value;
+		}
 	},
 );
 
-// Variables & context items should be collapsed by default
-watch(
-	contextItems,
-	(currentContextItems) => {
-		currentContextItems
+// Collapse all nodes except the first
+const unwatchItems = watch(items, (newItems) => {
+	if (newItems.length < 2) return;
+	closedNodes.value = new Set(
+		newItems
 			.filter((item) => item.type === 'header')
-			.forEach((item) => {
-				closedNodes.value.add(item.id);
-			});
-	},
-	{ once: true, immediate: true },
-);
+			.slice(1)
+			.map((item) => item.id),
+	);
+	unwatchItems();
+});
 
 const onDragStart = (el: HTMLElement, data?: string) => {
 	ndvStore.draggableStartDragging({
@@ -356,13 +382,14 @@ const onDragEnd = (el: HTMLElement) => {
 
 		const isPreview = parentNode?.preview ?? false;
 		const hasCredential = !isEmpty(parentNode?.node.credentials);
+		const runIndex = Number(el.dataset.runIndex);
 
 		const telemetryPayload = {
 			src_node_type: el.dataset.nodeType,
 			src_field_name: el.dataset.name ?? '',
 			src_nodes_back: el.dataset.depth,
-			src_run_index: props.runIndex,
-			src_runs_total: props.totalRuns,
+			src_run_index: runIndex,
+			src_runs_total: runIndex,
 			src_field_nest_level: el.dataset.level ?? 0,
 			src_view: isPreview ? 'schema_preview' : 'schema',
 			src_has_credential: hasCredential,
@@ -424,8 +451,8 @@ const onDragEnd = (el: HTMLElement) => {
 							v-if="item.type === 'header'"
 							v-bind="item"
 							:collapsed="closedNodes.has(item.id)"
-							@click:toggle="toggleLeaf(item.id)"
-							@click="toggleNodeAndScrollTop(item.id)"
+							@click:toggle="toggleNode(item.id)"
+							@click="toggleNodeExclusiveAndScrollTop(item.id)"
 						/>
 						<VirtualSchemaItem
 							v-else-if="item.type === 'item'"
@@ -434,7 +461,7 @@ const onDragEnd = (el: HTMLElement) => {
 							:draggable="mappingEnabled"
 							:collapsed="closedNodes.has(item.id)"
 							:highlight="ndvStore.highlightDraggables"
-							@click="toggleLeaf(item.id)"
+							@click="toggleNode(item.id)"
 						>
 						</VirtualSchemaItem>
 
@@ -461,13 +488,14 @@ const onDragEnd = (el: HTMLElement) => {
 								>
 									<template #link>
 										<NodeExecuteButton
-											:node-name="item.nodeName"
+											v-if="ndvStore.activeNodeName"
+											:node-name="ndvStore.activeNodeName"
 											:label="i18n.baseText('ndv.input.noOutputData.executePrevious')"
 											text
 											telemetry-source="inputs"
 											hide-icon
 											size="small"
-											class="execute-button"
+											:class="$style.executeButton"
 										/>
 									</template>
 								</i18n-t>
@@ -481,6 +509,12 @@ const onDragEnd = (el: HTMLElement) => {
 	</div>
 </template>
 
+<style lang="css" module>
+.executeButton {
+	padding: 0;
+}
+</style>
+
 <style lang="css" scoped>
 .full-height {
 	height: 100%;
@@ -532,8 +566,4 @@ const onDragEnd = (el: HTMLElement) => {
 	padding-bottom: var(--spacing-xs);
 	margin-left: calc((var(--spacing-xl) * var(--schema-level)));
 }
-
-.execute-button {
-	padding: 0;
-}
 </style>
diff --git a/packages/frontend/editor-ui/src/components/VirtualSchemaItem.vue b/packages/frontend/editor-ui/src/components/VirtualSchemaItem.vue
index 7e1c194ddf..04434a3cca 100644
--- a/packages/frontend/editor-ui/src/components/VirtualSchemaItem.vue
+++ b/packages/frontend/editor-ui/src/components/VirtualSchemaItem.vue
@@ -22,6 +22,7 @@ type Props = {
 	preview?: boolean;
 	locked?: boolean;
 	lockedTooltip?: string;
+	runIndex?: number;
 };
 
 const props = defineProps<Props>();
@@ -48,6 +49,7 @@ const emit = defineEmits<{
 			:data-node-type="nodeType"
 			:data-target="!locked && 'mappable'"
 			:data-node-name="nodeName"
+			:data-run-index="runIndex"
 			class="pill"
 			:class="{
 				'pill--highlight': highlight,
diff --git a/packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap b/packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
index cfc92932e0..fa11a38ead 100644
--- a/packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
+++ b/packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
@@ -21,357 +21,6 @@ exports[`VirtualSchema.vue > renders preview schema when enabled and available 1
         
         
         
-        <div
-          class="schema-header-wrapper"
-          data-v-882a318e=""
-          data-v-d00cba9a=""
-          id="Manual Trigger"
-          type="header"
-        >
-          <div
-            class="schema-header"
-            data-test-id="run-data-schema-header"
-            data-v-882a318e=""
-          >
-            <div
-              class="toggle"
-              data-v-882a318e=""
-            >
-              <font-awesome-icon-stub
-                beat="false"
-                beatfade="false"
-                border="false"
-                bounce="false"
-                class="collapse-icon"
-                data-v-882a318e=""
-                fade="false"
-                fixedwidth="false"
-                flash="false"
-                flip="false"
-                icon="angle-down"
-                inverse="false"
-                listitem="false"
-                pulse="false"
-                shake="false"
-                spin="false"
-                spinpulse="false"
-                spinreverse="false"
-                swapopacity="false"
-                symbol="false"
-              />
-            </div>
-            <div
-              class="n8n-node-icon icon icon-trigger icon icon-trigger"
-              data-v-882a318e=""
-            >
-              <div
-                class="nodeIconWrapper"
-                style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
-              >
-                <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
-                
-                <div
-                  class="icon"
-                >
-                  <img
-                    class="nodeIconImage"
-                    src="/nodes/test-node/icon.svg"
-                  />
-                  <!--v-if-->
-                </div>
-                
-              </div>
-            </div>
-            <div
-              class="title"
-              data-v-882a318e=""
-            >
-              Manual Trigger 
-              <!--v-if-->
-            </div>
-            <font-awesome-icon-stub
-              beat="false"
-              beatfade="false"
-              border="false"
-              bounce="false"
-              class="trigger-icon"
-              data-v-882a318e=""
-              fade="false"
-              fixedwidth="false"
-              flash="false"
-              flip="false"
-              icon="bolt"
-              inverse="false"
-              listitem="false"
-              pulse="false"
-              shake="false"
-              size="xs"
-              spin="false"
-              spinpulse="false"
-              spinreverse="false"
-              swapopacity="false"
-              symbol="false"
-            />
-            <div
-              class="extra-info"
-              data-v-882a318e=""
-            >
-              Preview
-            </div>
-          </div>
-          <div
-            class="notice"
-            data-test-id="schema-preview-warning"
-            data-v-882a318e=""
-          >
-            
-            Usually outputs the following fields. Execute the node to see the actual ones. 
-            
-            <a
-              class="n8n-link"
-              data-v-882a318e=""
-              href="https://docs.n8n.io/data/schema-preview/"
-              target="_blank"
-            >
-              
-              <span
-                class="primary"
-              >
-                <span
-                  class="n8n-text size-small bold"
-                >
-                  
-                  
-                  Learn more
-                  
-                  
-                </span>
-              </span>
-              
-            </a>
-            
-            
-          </div>
-        </div>
-        
-        
-        
-        
-        <div
-          class="schema-item draggable"
-          data-test-id="run-data-schema-item"
-          data-v-0f5e7239=""
-          data-v-d00cba9a=""
-          type="item"
-        >
-          <div
-            class="toggle-container"
-            data-v-0f5e7239=""
-          >
-            <div
-              class="toggle"
-              data-v-0f5e7239=""
-            >
-              <font-awesome-icon-stub
-                beat="false"
-                beatfade="false"
-                border="false"
-                bounce="false"
-                class="collapse-icon"
-                data-v-0f5e7239=""
-                fade="false"
-                fixedwidth="false"
-                flash="false"
-                flip="false"
-                icon="angle-down"
-                inverse="false"
-                listitem="false"
-                pulse="false"
-                shake="false"
-                spin="false"
-                spinpulse="false"
-                spinreverse="false"
-                swapopacity="false"
-                symbol="false"
-              />
-            </div>
-          </div>
-          <div
-            class="pill pill--preview"
-            data-depth="1"
-            data-name="account"
-            data-nest-level="1"
-            data-node-name="Manual Trigger"
-            data-node-type="n8n-nodes-base.manualTrigger"
-            data-path=".account"
-            data-target="mappable"
-            data-test-id="run-data-schema-node-name"
-            data-v-0f5e7239=""
-            data-value="{{ $json.account }}"
-          >
-            <font-awesome-icon-stub
-              beat="false"
-              beatfade="false"
-              border="false"
-              bounce="false"
-              class="type-icon"
-              data-v-0f5e7239=""
-              fade="false"
-              fixedwidth="false"
-              flash="false"
-              flip="false"
-              icon="cube"
-              inverse="false"
-              listitem="false"
-              pulse="false"
-              shake="false"
-              size="sm"
-              spin="false"
-              spinpulse="false"
-              spinreverse="false"
-              swapopacity="false"
-              symbol="false"
-            />
-            <span
-              class="content title"
-              data-v-0f5e7239=""
-            >
-              
-              <span>
-                <!--v-if-->
-                account
-              </span>
-              
-            </span>
-          </div>
-          <!--v-if-->
-          <span
-            class="content text"
-            data-test-id="run-data-schema-item-value"
-            data-v-0f5e7239=""
-          >
-            <span />
-          </span>
-        </div>
-        
-        
-        
-        
-        <div
-          class="schema-item draggable"
-          data-test-id="run-data-schema-item"
-          data-v-0f5e7239=""
-          data-v-d00cba9a=""
-          type="item"
-        >
-          <div
-            class="toggle-container"
-            data-v-0f5e7239=""
-          >
-            <!--v-if-->
-          </div>
-          <div
-            class="pill pill--preview"
-            data-depth="1"
-            data-name="id"
-            data-nest-level="2"
-            data-node-name="Manual Trigger"
-            data-node-type="n8n-nodes-base.manualTrigger"
-            data-path=".account.id"
-            data-target="mappable"
-            data-test-id="run-data-schema-node-name"
-            data-v-0f5e7239=""
-            data-value="{{ $json.account.id }}"
-          >
-            <font-awesome-icon-stub
-              beat="false"
-              beatfade="false"
-              border="false"
-              bounce="false"
-              class="type-icon"
-              data-v-0f5e7239=""
-              fade="false"
-              fixedwidth="false"
-              flash="false"
-              flip="false"
-              icon="font"
-              inverse="false"
-              listitem="false"
-              pulse="false"
-              shake="false"
-              size="sm"
-              spin="false"
-              spinpulse="false"
-              spinreverse="false"
-              swapopacity="false"
-              symbol="false"
-            />
-            <span
-              class="content title"
-              data-v-0f5e7239=""
-            >
-              
-              <span>
-                <!--v-if-->
-                id
-              </span>
-              
-            </span>
-          </div>
-          <!--v-if-->
-          <span
-            class="content text"
-            data-test-id="run-data-schema-item-value"
-            data-v-0f5e7239=""
-          >
-            
-            <span>
-              <!--v-if-->
-              
-            </span>
-            
-          </span>
-        </div>
-        
-        
-        
-        
-        
-        <span
-          class="n8n-text compact size-14 regular n8n-icon icon el-tooltip__trigger el-tooltip__trigger icon el-tooltip__trigger el-tooltip__trigger n8n-icon icon el-tooltip__trigger el-tooltip__trigger icon el-tooltip__trigger el-tooltip__trigger"
-          data-v-d00cba9a=""
-        >
-          
-          <font-awesome-icon-stub
-            beat="false"
-            beatfade="false"
-            border="false"
-            bounce="false"
-            class="14"
-            fade="false"
-            fixedwidth="false"
-            flash="false"
-            flip="false"
-            icon="ellipsis-h"
-            inverse="false"
-            listitem="false"
-            pulse="false"
-            shake="false"
-            spin="false"
-            spinpulse="false"
-            spinreverse="false"
-            swapopacity="false"
-            symbol="false"
-          />
-          
-        </span>
-        <!--teleport start-->
-        <!--teleport end-->
-        
-        
-        
-        
-        
         <div
           class="schema-header-wrapper"
           data-v-882a318e=""
@@ -527,7 +176,7 @@ exports[`VirtualSchema.vue > renders preview schema when enabled and available 1
           </div>
           <div
             class="pill pill--preview"
-            data-depth="2"
+            data-depth="1"
             data-name="account"
             data-nest-level="1"
             data-node-name="Set2"
@@ -536,7 +185,7 @@ exports[`VirtualSchema.vue > renders preview schema when enabled and available 1
             data-target="mappable"
             data-test-id="run-data-schema-node-name"
             data-v-0f5e7239=""
-            data-value="{{ $('Set2').item.json.account }}"
+            data-value="{{ $json.account }}"
           >
             <font-awesome-icon-stub
               beat="false"
@@ -601,7 +250,7 @@ exports[`VirtualSchema.vue > renders preview schema when enabled and available 1
           </div>
           <div
             class="pill pill--preview"
-            data-depth="2"
+            data-depth="1"
             data-name="id"
             data-nest-level="2"
             data-node-name="Set2"
@@ -610,7 +259,7 @@ exports[`VirtualSchema.vue > renders preview schema when enabled and available 1
             data-target="mappable"
             data-test-id="run-data-schema-node-name"
             data-v-0f5e7239=""
-            data-value="{{ $('Set2').item.json.account.id }}"
+            data-value="{{ $json.account.id }}"
           >
             <font-awesome-icon-stub
               beat="false"
@@ -838,79 +487,6 @@ exports[`VirtualSchema.vue > renders previous nodes schema for AI tools 1`] = `
 </div>
 `;
 
-exports[`VirtualSchema.vue > renders schema for correct output branch 1`] = `
-<div
-  class="schema-header"
-  data-test-id="run-data-schema-header"
-  data-v-882a318e=""
->
-  <div
-    class="toggle"
-    data-v-882a318e=""
-  >
-    <font-awesome-icon-stub
-      beat="false"
-      beatfade="false"
-      border="false"
-      bounce="false"
-      class="collapse-icon"
-      data-v-882a318e=""
-      fade="false"
-      fixedwidth="false"
-      flash="false"
-      flip="false"
-      icon="angle-down"
-      inverse="false"
-      listitem="false"
-      pulse="false"
-      shake="false"
-      spin="false"
-      spinpulse="false"
-      spinreverse="false"
-      swapopacity="false"
-      symbol="false"
-    />
-  </div>
-  <div
-    class="n8n-node-icon icon icon"
-    data-v-882a318e=""
-  >
-    <div
-      class="nodeIconWrapper"
-      style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
-    >
-      <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
-      
-      <div
-        class="icon"
-      >
-        <img
-          class="nodeIconImage"
-          src="/nodes/test-node/icon.svg"
-        />
-        <!--v-if-->
-      </div>
-      
-    </div>
-  </div>
-  <div
-    class="title"
-    data-v-882a318e=""
-  >
-    If 
-    <!--v-if-->
-  </div>
-  <!--v-if-->
-  <div
-    class="extra-info"
-    data-test-id="run-data-schema-node-item-count"
-    data-v-882a318e=""
-  >
-    2 items
-  </div>
-</div>
-`;
-
 exports[`VirtualSchema.vue > renders schema for empty objects and arrays 1`] = `
 <div>
   <div
@@ -2741,7 +2317,7 @@ exports[`VirtualSchema.vue > renders schema with spaces and dots 1`] = `
                 beatfade="false"
                 border="false"
                 bounce="false"
-                class="collapse-icon"
+                class="collapse-icon collapsed"
                 data-v-882a318e=""
                 fade="false"
                 fixedwidth="false"
@@ -2797,45 +2373,6 @@ exports[`VirtualSchema.vue > renders schema with spaces and dots 1`] = `
         
         
         
-        <div
-          class="empty-schema"
-          data-v-d00cba9a=""
-          style="--schema-level: 1;"
-        >
-          <div
-            class="n8n-text size-small regular"
-            data-v-d00cba9a=""
-          >
-            
-            <span
-              data-v-d00cba9a=""
-            >
-              
-              
-              <button
-                aria-live="polite"
-                class="button button primary small text execute-button el-tooltip__trigger el-tooltip__trigger execute-button el-tooltip__trigger el-tooltip__trigger"
-                title="Runs the current node. Will also run previous nodes if they have not been run yet"
-                transparent-background="false"
-              >
-                <!--v-if-->
-                <span>
-                  Execute previous nodes
-                </span>
-              </button>
-              <!--teleport start-->
-              <!--teleport end-->
-              
-              
-               to see schema
-            </span>
-            
-          </div>
-        </div>
-        
-        
-        
-        
         <div
           class="schema-header-wrapper"
           data-v-882a318e=""
@@ -3990,6 +3527,397 @@ exports[`VirtualSchema.vue > renders variables and context section 1`] = `
         
         
         
+      </div>
+      
+      <!--teleport start-->
+      <!--teleport end-->
+    </div>
+  </div>
+</div>
+`;
+
+exports[`VirtualSchema.vue > should expand all nodes when searching 1`] = `
+<div>
+  <div
+    class="run-data-schema full-height"
+    data-v-d00cba9a=""
+  >
+    <!--v-if-->
+    <div
+      class="full-height"
+      data-test-id="draggable"
+      data-v-d00cba9a=""
+    >
+      
+      <div
+        class="full-height scroller"
+        data-v-d00cba9a=""
+        min-item-size="38"
+      >
+        
+        
+        
+        <div
+          class="schema-header-wrapper"
+          data-v-882a318e=""
+          data-v-d00cba9a=""
+          id="Manual Trigger"
+          type="header"
+        >
+          <div
+            class="schema-header"
+            data-test-id="run-data-schema-header"
+            data-v-882a318e=""
+          >
+            <div
+              class="toggle"
+              data-v-882a318e=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-882a318e=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+            <div
+              class="n8n-node-icon icon icon-trigger icon icon-trigger"
+              data-v-882a318e=""
+            >
+              <div
+                class="nodeIconWrapper"
+                style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+              >
+                <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+                
+                <div
+                  class="icon"
+                >
+                  <img
+                    class="nodeIconImage"
+                    src="/nodes/test-node/icon.svg"
+                  />
+                  <!--v-if-->
+                </div>
+                
+              </div>
+            </div>
+            <div
+              class="title"
+              data-v-882a318e=""
+            >
+              Manual Trigger 
+              <!--v-if-->
+            </div>
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="trigger-icon"
+              data-v-882a318e=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="bolt"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="xs"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <div
+              class="extra-info"
+              data-test-id="run-data-schema-node-item-count"
+              data-v-882a318e=""
+            >
+              1 item
+            </div>
+          </div>
+          <!--v-if-->
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill"
+            data-depth="1"
+            data-name="name"
+            data-nest-level="1"
+            data-node-name="Manual Trigger"
+            data-node-type="n8n-nodes-base.manualTrigger"
+            data-path=".name"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $json.name }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="font"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="title"
+              data-v-0f5e7239=""
+            >
+              
+              
+              <span>
+                name
+              </span>
+              
+              
+            </span>
+          </div>
+          <!--v-if-->
+          <span
+            class="text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            
+            <!--v-if-->
+            
+            
+            <mark>
+              John
+            </mark>
+            
+            
+            <!--v-if-->
+            
+            
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-header-wrapper"
+          data-v-882a318e=""
+          data-v-d00cba9a=""
+          id="Set2"
+          type="header"
+        >
+          <div
+            class="schema-header"
+            data-test-id="run-data-schema-header"
+            data-v-882a318e=""
+          >
+            <div
+              class="toggle"
+              data-v-882a318e=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-882a318e=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+            <div
+              class="n8n-node-icon icon icon"
+              data-v-882a318e=""
+            >
+              <div
+                class="nodeIconWrapper"
+                style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+              >
+                <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+                
+                <div
+                  class="icon"
+                >
+                  <img
+                    class="nodeIconImage"
+                    src="/nodes/test-node/icon.svg"
+                  />
+                  <!--v-if-->
+                </div>
+                
+              </div>
+            </div>
+            <div
+              class="title"
+              data-v-882a318e=""
+            >
+              Set2 
+              <!--v-if-->
+            </div>
+            <!--v-if-->
+            <div
+              class="extra-info"
+              data-test-id="run-data-schema-node-item-count"
+              data-v-882a318e=""
+            >
+              1 item
+            </div>
+          </div>
+          <!--v-if-->
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill"
+            data-depth="2"
+            data-name="name"
+            data-nest-level="1"
+            data-node-name="Set2"
+            data-node-type="n8n-nodes-base.set"
+            data-path=".name"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $('Set2').item.json.name }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="font"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="title"
+              data-v-0f5e7239=""
+            >
+              
+              
+              <span>
+                name
+              </span>
+              
+              
+            </span>
+          </div>
+          <!--v-if-->
+          <span
+            class="text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            
+            <!--v-if-->
+            
+            
+            <mark>
+              John
+            </mark>
+            
+            
+            <!--v-if-->
+            
+            
+          </span>
+        </div>
+        
+        
+        
       </div>
       
       <!--teleport start-->
diff --git a/packages/frontend/editor-ui/src/composables/__snapshots__/useDataSchema.test.ts.snap b/packages/frontend/editor-ui/src/composables/__snapshots__/useDataSchema.test.ts.snap
new file mode 100644
index 0000000000..227d35a9e2
--- /dev/null
+++ b/packages/frontend/editor-ui/src/composables/__snapshots__/useDataSchema.test.ts.snap
@@ -0,0 +1,140 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`useFlattenSchema > flattenMultipleSchemas > should flatten node schemas 1`] = `
+[
+  {
+    "collapsable": true,
+    "id": "Test Node",
+    "info": undefined,
+    "itemCount": [MockFunction spy],
+    "nodeType": [MockFunction spy],
+    "preview": false,
+    "title": "Test Node",
+    "type": "header",
+  },
+  {
+    "collapsable": true,
+    "depth": [MockFunction spy],
+    "expression": "{{ $('Test Node').item.json }}",
+    "icon": "cube",
+    "id": "Test Node-{{ $('Test Node').item.json }}",
+    "level": 0,
+    "nodeName": "Test Node",
+    "nodeType": [MockFunction spy],
+    "path": "",
+    "preview": false,
+    "title": [MockFunction spy],
+    "type": "item",
+  },
+  {
+    "collapsable": true,
+    "depth": [MockFunction spy],
+    "expression": "{{ $('Test Node').item.json.obj }}",
+    "icon": "cube",
+    "id": "Test Node-{{ $('Test Node').item.json.obj }}",
+    "level": 1,
+    "nodeName": "Test Node",
+    "nodeType": [MockFunction spy],
+    "path": ".obj",
+    "preview": false,
+    "title": "obj",
+    "type": "item",
+  },
+  {
+    "collapsable": true,
+    "depth": [MockFunction spy],
+    "expression": "{{ $('Test Node').item.json.obj.foo }}",
+    "icon": "cube",
+    "id": "Test Node-{{ $('Test Node').item.json.obj.foo }}",
+    "level": 2,
+    "nodeName": "Test Node",
+    "nodeType": [MockFunction spy],
+    "path": ".obj.foo",
+    "preview": false,
+    "title": "foo",
+    "type": "item",
+  },
+  {
+    "collapsable": false,
+    "depth": [MockFunction spy],
+    "expression": "{{ $('Test Node').item.json.obj.foo.nested }}",
+    "icon": "font",
+    "id": "Test Node-{{ $('Test Node').item.json.obj.foo.nested }}",
+    "level": 3,
+    "nodeName": "Test Node",
+    "nodeType": [MockFunction spy],
+    "path": ".obj.foo.nested",
+    "preview": false,
+    "title": "nested",
+    "type": "item",
+    "value": "bar",
+  },
+  {
+    "collapsable": true,
+    "id": "Test Node",
+    "info": undefined,
+    "itemCount": [MockFunction spy],
+    "nodeType": [MockFunction spy],
+    "preview": false,
+    "title": "Test Node",
+    "type": "header",
+  },
+  {
+    "collapsable": true,
+    "depth": [MockFunction spy],
+    "expression": "{{ $('Test Node').item.json }}",
+    "icon": "cube",
+    "id": "Test Node-{{ $('Test Node').item.json }}",
+    "level": 0,
+    "nodeName": "Test Node",
+    "nodeType": [MockFunction spy],
+    "path": "",
+    "preview": false,
+    "title": [MockFunction spy],
+    "type": "item",
+  },
+  {
+    "collapsable": true,
+    "depth": [MockFunction spy],
+    "expression": "{{ $('Test Node').item.json.obj }}",
+    "icon": "cube",
+    "id": "Test Node-{{ $('Test Node').item.json.obj }}",
+    "level": 1,
+    "nodeName": "Test Node",
+    "nodeType": [MockFunction spy],
+    "path": ".obj",
+    "preview": false,
+    "title": "obj",
+    "type": "item",
+  },
+  {
+    "collapsable": true,
+    "depth": [MockFunction spy],
+    "expression": "{{ $('Test Node').item.json.obj.foo }}",
+    "icon": "cube",
+    "id": "Test Node-{{ $('Test Node').item.json.obj.foo }}",
+    "level": 2,
+    "nodeName": "Test Node",
+    "nodeType": [MockFunction spy],
+    "path": ".obj.foo",
+    "preview": false,
+    "title": "foo",
+    "type": "item",
+  },
+  {
+    "collapsable": false,
+    "depth": [MockFunction spy],
+    "expression": "{{ $('Test Node').item.json.obj.foo.nested }}",
+    "icon": "font",
+    "id": "Test Node-{{ $('Test Node').item.json.obj.foo.nested }}",
+    "level": 3,
+    "nodeName": "Test Node",
+    "nodeType": [MockFunction spy],
+    "path": ".obj.foo.nested",
+    "preview": false,
+    "title": "nested",
+    "type": "item",
+    "value": "bar",
+  },
+]
+`;
diff --git a/packages/frontend/editor-ui/src/composables/useDataSchema.test.ts b/packages/frontend/editor-ui/src/composables/useDataSchema.test.ts
index d213805466..6ed1db3700 100644
--- a/packages/frontend/editor-ui/src/composables/useDataSchema.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useDataSchema.test.ts
@@ -1,5 +1,5 @@
 import jp from 'jsonpath';
-import { useDataSchema, useFlattenSchema } from '@/composables/useDataSchema';
+import { useDataSchema, useFlattenSchema, type SchemaNode } from '@/composables/useDataSchema';
 import type { IExecutionResponse, INodeUi, Schema } from '@/Interface';
 import { setActivePinia } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
@@ -10,6 +10,7 @@ import {
 } from 'n8n-workflow';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { JSONSchema7 } from 'json-schema';
+import { mock } from 'vitest-mock-extended';
 
 vi.mock('@/stores/workflows.store');
 
@@ -785,57 +786,197 @@ describe('useDataSchema', () => {
 });
 
 describe('useFlattenSchema', () => {
-	it('flattens a schema', () => {
-		const schema: Schema = {
-			path: '',
-			type: 'object',
-			value: [
-				{
-					key: 'obj',
-					path: '.obj',
-					type: 'object',
-					value: [
-						{
-							key: 'foo',
-							path: '.obj.foo',
-							type: 'object',
-							value: [
-								{
-									key: 'nested',
-									path: '.obj.foo.nested',
-									type: 'string',
-									value: 'bar',
-								},
-							],
-						},
-					],
-				},
-			],
-		};
-		expect(
-			useFlattenSchema().flattenSchema({
-				schema,
-			}).length,
-		).toBe(3);
+	describe('flattenSchema', () => {
+		it('flattens a schema', () => {
+			const schema: Schema = {
+				path: '',
+				type: 'object',
+				value: [
+					{
+						key: 'obj',
+						path: '.obj',
+						type: 'object',
+						value: [
+							{
+								key: 'foo',
+								path: '.obj.foo',
+								type: 'object',
+								value: [
+									{
+										key: 'nested',
+										path: '.obj.foo.nested',
+										type: 'string',
+										value: 'bar',
+									},
+								],
+							},
+						],
+					},
+				],
+			};
+			expect(
+				useFlattenSchema().flattenSchema({
+					schema,
+				}).length,
+			).toBe(3);
+		});
+
+		it('items ids should be unique', () => {
+			const { flattenSchema } = useFlattenSchema();
+			const schema: Schema = {
+				path: '',
+				type: 'object',
+				value: [
+					{
+						key: 'index',
+						type: 'number',
+						value: '0',
+						path: '.index',
+					},
+				],
+			};
+			const node1Schema = flattenSchema({ schema, expressionPrefix: '$("First Node")', depth: 1 });
+			const node2Schema = flattenSchema({ schema, expressionPrefix: '$("Second Node")', depth: 1 });
+
+			expect(node1Schema[0].id).not.toBe(node2Schema[0].id);
+		});
 	});
 
-	it('items ids should be unique', () => {
-		const { flattenSchema } = useFlattenSchema();
-		const schema: Schema = {
-			path: '',
-			type: 'object',
-			value: [
-				{
-					key: 'index',
-					type: 'number',
-					value: '0',
-					path: '.index',
-				},
-			],
-		};
-		const node1Schema = flattenSchema({ schema, expressionPrefix: '$("First Node")', depth: 1 });
-		const node2Schema = flattenSchema({ schema, expressionPrefix: '$("Second Node")', depth: 1 });
+	describe('flattenMultipleSchemas', () => {
+		it('should handle empty data', () => {
+			const { flattenMultipleSchemas } = useFlattenSchema();
 
-		expect(node1Schema[0].id).not.toBe(node2Schema[0].id);
+			const result = flattenMultipleSchemas(
+				[
+					mock<SchemaNode>({
+						node: { name: 'Test Node' },
+						isDataEmpty: true,
+						schema: { type: 'object', value: [] },
+					}),
+				],
+				vi.fn(),
+			);
+			expect(result).toHaveLength(2);
+			expect(result[0]).toEqual(expect.objectContaining({ type: 'header', title: 'Test Node' }));
+			expect(result[1]).toEqual(
+				expect.objectContaining({ type: 'empty', key: 'emptyData', level: 1 }),
+			);
+		});
+
+		it('should handle unexecuted nodes', () => {
+			const { flattenMultipleSchemas } = useFlattenSchema();
+
+			const result = flattenMultipleSchemas(
+				[
+					mock<SchemaNode>({
+						node: { name: 'Test Node' },
+						isNodeExecuted: false,
+						schema: { type: 'object', value: [] },
+					}),
+				],
+				vi.fn(),
+			);
+			expect(result).toHaveLength(2);
+			expect(result[0]).toEqual(expect.objectContaining({ type: 'header', title: 'Test Node' }));
+			expect(result[1]).toEqual(
+				expect.objectContaining({ type: 'empty', key: 'executeSchema', level: 1 }),
+			);
+		});
+
+		it('should handle empty schema', () => {
+			const { flattenMultipleSchemas } = useFlattenSchema();
+
+			const result = flattenMultipleSchemas(
+				[
+					mock<SchemaNode>({
+						node: { name: 'Test Node' },
+						isDataEmpty: false,
+						hasBinary: false,
+						schema: { type: 'object', value: [] },
+					}),
+				],
+				vi.fn(),
+			);
+			expect(result).toHaveLength(2);
+			expect(result[0]).toEqual(expect.objectContaining({ type: 'header', title: 'Test Node' }));
+			expect(result[1]).toEqual(
+				expect.objectContaining({ type: 'empty', key: 'emptySchema', level: 1 }),
+			);
+		});
+
+		it('should handle empty schema with binary', () => {
+			const { flattenMultipleSchemas } = useFlattenSchema();
+
+			const result = flattenMultipleSchemas(
+				[
+					mock<SchemaNode>({
+						node: { name: 'Test Node' },
+						isDataEmpty: false,
+						hasBinary: true,
+						schema: { type: 'object', value: [] },
+					}),
+				],
+				vi.fn(),
+			);
+			expect(result).toHaveLength(2);
+			expect(result[0]).toEqual(expect.objectContaining({ type: 'header', title: 'Test Node' }));
+			expect(result[1]).toEqual(
+				expect.objectContaining({ type: 'empty', key: 'emptySchemaWithBinary', level: 1 }),
+			);
+		});
+
+		it('should flatten node schemas', () => {
+			const { flattenMultipleSchemas } = useFlattenSchema();
+			const schema: Schema = {
+				path: '',
+				type: 'object',
+				value: [
+					{
+						key: 'obj',
+						path: '.obj',
+						type: 'object',
+						value: [
+							{
+								key: 'foo',
+								path: '.obj.foo',
+								type: 'object',
+								value: [
+									{
+										key: 'nested',
+										path: '.obj.foo.nested',
+										type: 'string',
+										value: 'bar',
+									},
+								],
+							},
+						],
+					},
+				],
+			};
+
+			const result = flattenMultipleSchemas(
+				[
+					mock<SchemaNode>({
+						node: { name: 'Test Node' },
+						isDataEmpty: false,
+						hasBinary: false,
+						preview: false,
+						schema,
+					}),
+					mock<SchemaNode>({
+						node: { name: 'Test Node' },
+						isDataEmpty: false,
+						hasBinary: false,
+						preview: false,
+						schema,
+					}),
+				],
+				vi.fn(),
+			);
+			expect(result).toHaveLength(10);
+			expect(result.filter((item) => item.type === 'header')).toHaveLength(2);
+			expect(result.filter((item) => item.type === 'item')).toHaveLength(8);
+			expect(result).toMatchSnapshot();
+		});
 	});
 });
diff --git a/packages/frontend/editor-ui/src/composables/useDataSchema.ts b/packages/frontend/editor-ui/src/composables/useDataSchema.ts
index a8cdfa688e..16092d11d4 100644
--- a/packages/frontend/editor-ui/src/composables/useDataSchema.ts
+++ b/packages/frontend/editor-ui/src/composables/useDataSchema.ts
@@ -235,6 +235,8 @@ export type SchemaNode = {
 	preview: boolean;
 	isNodeExecuted: boolean;
 	hasBinary: boolean;
+	runIndex: number;
+	isDataEmpty: boolean;
 };
 
 export type RenderItem = {
@@ -285,7 +287,7 @@ export type RenderEmpty = {
 	type: 'empty';
 	level: number;
 	nodeName: string;
-	key: 'emptyData' | 'emptyDataWithBinary' | 'executeSchema';
+	key: 'emptyData' | 'emptySchema' | 'emptySchemaWithBinary' | 'executeSchema';
 };
 
 export type Renders = RenderHeader | RenderItem | RenderIcon | RenderNotice | RenderEmpty;
@@ -323,7 +325,7 @@ const moreFieldsItem = (): RenderIcon => ({
 	tooltip: useI18n().baseText('dataMapping.schemaView.previewExtraFields'),
 });
 
-const isDataEmpty = (schema: Schema) => {
+const isEmptySchema = (schema: Schema) => {
 	// Utilize the generated schema instead of looping over the entire data again
 	// The schema for empty data is { type: 'object', value: [] }
 	const isObjectOrArray = schema.type === 'object';
@@ -336,18 +338,8 @@ const prefixTitle = (title: string, prefix?: string) => (prefix ? `${prefix}[${t
 
 export const useFlattenSchema = () => {
 	const closedNodes = ref<Set<string>>(new Set());
-	const headerIds = ref<Set<string>>(new Set());
-	const toggleLeaf = (id: string) => {
-		if (closedNodes.value.has(id)) {
-			closedNodes.value.delete(id);
-		} else {
-			closedNodes.value.add(id);
-		}
-	};
-
 	const toggleNode = (id: string) => {
 		if (closedNodes.value.has(id)) {
-			closedNodes.value = new Set(headerIds.value);
 			closedNodes.value.delete(id);
 		} else {
 			closedNodes.value.add(id);
@@ -374,7 +366,7 @@ export const useFlattenSchema = () => {
 		preview?: boolean;
 	}): Renders[] => {
 		// only show empty item for the first level
-		if (isDataEmpty(schema) && level < 0) {
+		if (isEmptySchema(schema) && level < 0) {
 			return [emptyItem('emptyData')];
 		}
 
@@ -450,8 +442,6 @@ export const useFlattenSchema = () => {
 		nodes: SchemaNode[],
 		additionalInfo: (node: INodeUi) => string,
 	) => {
-		headerIds.value.clear();
-
 		return nodes.reduce<Renders[]>((acc, item) => {
 			acc.push({
 				title: item.node.name,
@@ -464,20 +454,21 @@ export const useFlattenSchema = () => {
 				preview: item.preview,
 			});
 
-			headerIds.value.add(item.node.name);
-
 			if (closedNodes.value.has(item.node.name)) {
 				return acc;
 			}
 
-			if (isDataEmpty(item.schema) && !item.isNodeExecuted && !item.hasBinary) {
-				acc.push(emptyItem('executeSchema', { nodeName: item.node.name, level: 1 }));
-				return acc;
-			}
+			if (isEmptySchema(item.schema)) {
+				if (!item.isNodeExecuted) {
+					acc.push(emptyItem('executeSchema', { level: 1 }));
+					return acc;
+				}
 
-			if (isDataEmpty(item.schema)) {
-				const key = item.hasBinary ? 'emptyDataWithBinary' : 'emptyData';
-				acc.push(emptyItem(key, { level: 1 }));
+				if (item.isDataEmpty) {
+					acc.push(emptyItem('emptyData', { level: 1 }));
+					return acc;
+				}
+				acc.push(emptyItem(item.hasBinary ? 'emptySchemaWithBinary' : 'emptySchema', { level: 1 }));
 				return acc;
 			}
 
@@ -505,7 +496,6 @@ export const useFlattenSchema = () => {
 
 	return {
 		closedNodes,
-		toggleLeaf,
 		toggleNode,
 		flattenSchema,
 		flattenMultipleSchemas,
diff --git a/packages/frontend/editor-ui/src/composables/useNodeHelpers.test.ts b/packages/frontend/editor-ui/src/composables/useNodeHelpers.test.ts
index b051fad68c..db0be0cd7b 100644
--- a/packages/frontend/editor-ui/src/composables/useNodeHelpers.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useNodeHelpers.test.ts
@@ -5,10 +5,9 @@ import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { createTestNode } from '@/__tests__/mocks';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { CUSTOM_API_CALL_KEY } from '@/constants';
-
-vi.mock('@/stores/workflows.store', () => ({
-	useWorkflowsStore: vi.fn(),
-}));
+import { mockedStore } from '@/__tests__/utils';
+import { mock } from 'vitest-mock-extended';
+import type { ExecutionStatus, IRunData } from 'n8n-workflow';
 
 describe('useNodeHelpers()', () => {
 	beforeAll(() => {
@@ -55,42 +54,8 @@ describe('useNodeHelpers()', () => {
 			expect(result).toEqual([]);
 		});
 
-		it('should return an empty array when workflowsStore.getWorkflowExecution() is null', () => {
-			vi.mocked(useWorkflowsStore).mockReturnValue({
-				getWorkflowExecution: null,
-			} as ReturnType<typeof useWorkflowsStore>);
-			const { getNodeInputData } = useNodeHelpers();
-			const node = createTestNode({
-				name: 'test',
-				type: 'test',
-			});
-
-			const result = getNodeInputData(node);
-			expect(result).toEqual([]);
-		});
-
-		it('should return an empty array when workflowsStore.getWorkflowExecution() is null', () => {
-			vi.mocked(useWorkflowsStore).mockReturnValue({
-				getWorkflowExecution: null,
-			} as ReturnType<typeof useWorkflowsStore>);
-			const { getNodeInputData } = useNodeHelpers();
-			const node = createTestNode({
-				name: 'test',
-				type: 'test',
-			});
-
-			const result = getNodeInputData(node);
-			expect(result).toEqual([]);
-		});
-
-		it('should return an empty array when resultData is not available', () => {
-			vi.mocked(useWorkflowsStore).mockReturnValue({
-				getWorkflowExecution: {
-					data: {
-						resultData: null,
-					},
-				},
-			} as unknown as ReturnType<typeof useWorkflowsStore>);
+		it('should return an empty array when runData is not available', () => {
+			mockedStore(useWorkflowsStore).getWorkflowRunData = null;
 			const { getNodeInputData } = useNodeHelpers();
 			const node = createTestNode({
 				name: 'test',
@@ -103,17 +68,9 @@ describe('useNodeHelpers()', () => {
 
 		it('should return an empty array when taskData is unavailable', () => {
 			const nodeName = 'Code';
-			vi.mocked(useWorkflowsStore).mockReturnValue({
-				getWorkflowExecution: {
-					data: {
-						resultData: {
-							runData: {
-								[nodeName]: [],
-							},
-						},
-					},
-				},
-			} as unknown as ReturnType<typeof useWorkflowsStore>);
+			mockedStore(useWorkflowsStore).getWorkflowRunData = mock<IRunData>({
+				[nodeName]: [],
+			});
 			const { getNodeInputData } = useNodeHelpers();
 			const node = createTestNode({
 				name: nodeName,
@@ -126,17 +83,9 @@ describe('useNodeHelpers()', () => {
 
 		it('should return an empty array when taskData.data is unavailable', () => {
 			const nodeName = 'Code';
-			vi.mocked(useWorkflowsStore).mockReturnValue({
-				getWorkflowExecution: {
-					data: {
-						resultData: {
-							runData: {
-								[nodeName]: [{ data: undefined }],
-							},
-						},
-					},
-				},
-			} as unknown as ReturnType<typeof useWorkflowsStore>);
+			mockedStore(useWorkflowsStore).getWorkflowRunData = mock<IRunData>({
+				[nodeName]: [{ data: undefined }],
+			});
 			const { getNodeInputData } = useNodeHelpers();
 			const node = createTestNode({
 				name: nodeName,
@@ -149,24 +98,16 @@ describe('useNodeHelpers()', () => {
 
 		it('should return input data from inputOverride', () => {
 			const nodeName = 'Code';
-			const data = { hello: 'world' };
-			vi.mocked(useWorkflowsStore).mockReturnValue({
-				getWorkflowExecution: {
-					data: {
-						resultData: {
-							runData: {
-								[nodeName]: [
-									{
-										inputOverride: {
-											main: [data],
-										},
-									},
-								],
-							},
+			const data = [{ json: { hello: 'world' } }];
+			mockedStore(useWorkflowsStore).getWorkflowRunData = mock<IRunData>({
+				[nodeName]: [
+					{
+						inputOverride: {
+							main: [data],
 						},
 					},
-				},
-			} as unknown as ReturnType<typeof useWorkflowsStore>);
+				],
+			});
 			const { getNodeInputData } = useNodeHelpers();
 			const node = createTestNode({
 				name: nodeName,
@@ -180,24 +121,10 @@ describe('useNodeHelpers()', () => {
 		it.each(['example', 'example.withdot', 'example.with.dots', 'example.with.dots and spaces'])(
 			'should return input data for "%s" node name, with given connection type and output index',
 			(nodeName) => {
-				const data = { hello: 'world' };
-				vi.mocked(useWorkflowsStore).mockReturnValue({
-					getWorkflowExecution: {
-						data: {
-							resultData: {
-								runData: {
-									[nodeName]: [
-										{
-											data: {
-												main: [data],
-											},
-										},
-									],
-								},
-							},
-						},
-					},
-				} as unknown as ReturnType<typeof useWorkflowsStore>);
+				const data = [{ json: { hello: 'world' } }];
+				mockedStore(useWorkflowsStore).getWorkflowRunData = mock<IRunData>({
+					[nodeName]: [{ data: { main: [data] } }],
+				});
 				const { getNodeInputData } = useNodeHelpers();
 				const node = createTestNode({
 					name: nodeName,
@@ -210,6 +137,92 @@ describe('useNodeHelpers()', () => {
 		);
 	});
 
+	describe('getLastRunIndexWithData()', () => {
+		const mockData = [{ json: { hello: 'world' } }];
+		it('should return the last runIndex with data', () => {
+			const nodeName = 'Test Node';
+			const { getLastRunIndexWithData } = useNodeHelpers();
+
+			mockedStore(useWorkflowsStore).getWorkflowRunData = mock<IRunData>({
+				[nodeName]: [{ data: { main: [mockData] } }, { data: { main: [mockData] } }],
+			});
+			expect(getLastRunIndexWithData(nodeName)).toEqual(1);
+		});
+
+		it('should return -1 when there are no runs', () => {
+			const nodeName = 'Test Node';
+			const { getLastRunIndexWithData } = useNodeHelpers();
+
+			mockedStore(useWorkflowsStore).getWorkflowRunData = mock<IRunData>({
+				[nodeName]: [],
+			});
+			expect(getLastRunIndexWithData(nodeName)).toEqual(-1);
+		});
+
+		it('should return -1 when there is no runData', () => {
+			const nodeName = 'Test Node';
+			const { getLastRunIndexWithData } = useNodeHelpers();
+
+			mockedStore(useWorkflowsStore).getWorkflowRunData = null;
+			expect(getLastRunIndexWithData(nodeName)).toEqual(-1);
+		});
+
+		it('should work with custom outputIndex', () => {
+			const nodeName = 'Test Node';
+			const { getLastRunIndexWithData } = useNodeHelpers();
+
+			mockedStore(useWorkflowsStore).getWorkflowRunData = mock<IRunData>({
+				[nodeName]: [
+					{ data: { main: [mockData, []] } },
+					{ data: { main: [mockData, []] } },
+					{ data: { main: [mockData, mockData] } },
+					{ data: { main: [[], mockData] } },
+					{ data: { main: [[], []] } },
+				],
+			});
+			expect(getLastRunIndexWithData(nodeName, 1)).toEqual(3);
+		});
+
+		it('should work with custom connectionType', () => {
+			const nodeName = 'Test Node';
+			const { getLastRunIndexWithData } = useNodeHelpers();
+
+			mockedStore(useWorkflowsStore).getWorkflowRunData = mock<IRunData>({
+				[nodeName]: [
+					{ data: { main: [mockData], ai_tool: [mockData] } },
+					{ data: { ai_tool: [mockData] } },
+					{ data: { main: [mockData] } },
+				],
+			});
+			expect(getLastRunIndexWithData(nodeName, 0, 'ai_tool')).toEqual(1);
+		});
+	});
+
+	describe('hasNodeExecuted()', () => {
+		it('should return false when runData is not available', () => {
+			const nodeName = 'Test Node';
+			mockedStore(useWorkflowsStore).getWorkflowRunData = null;
+			const { hasNodeExecuted } = useNodeHelpers();
+			expect(hasNodeExecuted(nodeName)).toBe(false);
+		});
+
+		it.each<{ status?: ExecutionStatus; expected: boolean }>([
+			{ status: undefined, expected: false },
+			{ status: 'waiting', expected: false },
+			{ status: 'running', expected: false },
+			{ status: 'error', expected: true },
+			{ status: 'success', expected: true },
+		])('should return $expected when execution status is $status', ({ status, expected }) => {
+			const nodeName = 'Test Node';
+
+			mockedStore(useWorkflowsStore).getWorkflowRunData = mock<IRunData>({
+				[nodeName]: [{ executionStatus: status }],
+			});
+			const { hasNodeExecuted } = useNodeHelpers();
+			expect(hasNodeExecuted(nodeName)).toBe(expected);
+		});
+	});
+
 	describe('assignNodeId()', () => {
 		it('should assign a unique id to the node', () => {
 			const { assignNodeId } = useNodeHelpers();
diff --git a/packages/frontend/editor-ui/src/composables/useNodeHelpers.ts b/packages/frontend/editor-ui/src/composables/useNodeHelpers.ts
index 4c2f787134..593bcd4c37 100644
--- a/packages/frontend/editor-ui/src/composables/useNodeHelpers.ts
+++ b/packages/frontend/editor-ui/src/composables/useNodeHelpers.ts
@@ -1,10 +1,6 @@
 import { ref } from 'vue';
 import { useHistoryStore } from '@/stores/history.store';
-import {
-	CUSTOM_API_CALL_KEY,
-	PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-	SPLIT_IN_BATCHES_NODE_TYPE,
-} from '@/constants';
+import { CUSTOM_API_CALL_KEY, PLACEHOLDER_FILLED_AT_EXECUTION_TIME } from '@/constants';
 
 import { NodeHelpers, ExpressionEvaluatorProxy, NodeConnectionTypes } from 'n8n-workflow';
 import type {
@@ -546,27 +542,33 @@ export function useNodeHelpers() {
 		}
 	}
 
-	function getNodeTaskData(node: INodeUi | null, runIndex = 0) {
-		if (node === null) {
-			return null;
-		}
-		if (workflowsStore.getWorkflowExecution === null) {
-			return null;
-		}
+	function getNodeTaskData(nodeName: string, runIndex = 0) {
+		return getAllNodeTaskData(nodeName)?.[runIndex] ?? null;
+	}
 
-		const executionData = workflowsStore.getWorkflowExecution.data;
-		if (!executionData?.resultData) {
-			// unknown status
-			return null;
-		}
-		const runData = executionData.resultData.runData;
+	function getAllNodeTaskData(nodeName: string) {
+		return workflowsStore.getWorkflowRunData?.[nodeName] ?? null;
+	}
 
-		const taskData = get(runData, [node.name, runIndex]);
-		if (!taskData) {
-			return null;
-		}
+	function hasNodeExecuted(nodeName: string) {
+		return (
+			getAllNodeTaskData(nodeName)?.some(
+				({ executionStatus }) => executionStatus && ['success', 'error'].includes(executionStatus),
+			) ?? false
+		);
+	}
 
-		return taskData;
+	function getLastRunIndexWithData(
+		nodeName: string,
+		outputIndex = 0,
+		connectionType: NodeConnectionType = NodeConnectionTypes.Main,
+	) {
+		const allTaskData = getAllNodeTaskData(nodeName) ?? [];
+
+		return allTaskData.findLastIndex(
+			(taskData) =>
+				taskData.data && getInputData(taskData.data, outputIndex, connectionType).length > 0,
+		);
 	}
 
 	function getNodeInputData(
@@ -576,17 +578,8 @@ export function useNodeHelpers() {
 		paneType: NodePanelType = 'output',
 		connectionType: NodeConnectionType = NodeConnectionTypes.Main,
 	): INodeExecutionData[] {
-		//TODO: check if this needs to be fixed in different place
-		if (
-			node?.type === SPLIT_IN_BATCHES_NODE_TYPE &&
-			paneType === 'input' &&
-			runIndex !== 0 &&
-			outputIndex !== 0
-		) {
-			runIndex = runIndex - 1;
-		}
-
-		const taskData = getNodeTaskData(node, runIndex);
+		if (!node) return [];
+		const taskData = getNodeTaskData(node.name, runIndex);
 		if (taskData === null) {
 			return [];
 		}
@@ -1012,6 +1005,8 @@ export function useNodeHelpers() {
 		disableNodes,
 		getNodeSubtitle,
 		updateNodesCredentialsIssues,
+		getLastRunIndexWithData,
+		hasNodeExecuted,
 		getNodeInputData,
 		matchCredentials,
 		isInsertingNodes,
diff --git a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
index eecd88a805..7c5eda4de7 100644
--- a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
@@ -667,8 +667,9 @@
 	"dataMapping.tableView.tableColumnsExceeded": "Some columns are hidden",
 	"dataMapping.tableView.tableColumnsExceeded.tooltip": "Your data has more than {columnLimit} columns so some are hidden. Switch to {link} to see all data.",
 	"dataMapping.tableView.tableColumnsExceeded.tooltip.link": "JSON view",
-	"dataMapping.schemaView.emptyData": "No fields - item(s) exist, but they're empty",
-	"dataMapping.schemaView.emptyDataWithBinary": "Only binary data exists. View it using the 'Binary' tab",
+	"dataMapping.schemaView.emptyData": "No fields - node executed, but no items were sent on this branch",
+	"dataMapping.schemaView.emptySchema": "No fields - item(s) exist, but they're empty",
+	"dataMapping.schemaView.emptySchemaWithBinary": "Only binary data exists. View it using the 'Binary' tab",
 	"dataMapping.schemaView.executeSchema": "{link} to see schema",
 	"dataMapping.schemaView.disabled": "This node is disabled and will just pass data through",
 	"dataMapping.schemaView.noMatches": "No results for '{search}'",