diff --git a/frontend/src/lib/components/apps/components/buttons/AppForm.svelte b/frontend/src/lib/components/apps/components/buttons/AppForm.svelte
index b9c8e6fba9..68064c0136 100644
--- a/frontend/src/lib/components/apps/components/buttons/AppForm.svelte
+++ b/frontend/src/lib/components/apps/components/buttons/AppForm.svelte
@@ -83,10 +83,11 @@
 	)
 </script>
 
-{#each Object.keys(components['formcomponent'].initialData.configuration) as key (key)}
+{#each Object.entries(components['formcomponent'].initialData.configuration) as [key, initialConfig] (key)}
 	<ResolveConfig
 		{id}
 		{key}
+		{initialConfig}
 		bind:resolvedConfig={resolvedConfig[key]}
 		configuration={configuration[key]}
 	/>
diff --git a/frontend/src/lib/components/apps/components/buttons/AppFormButton.svelte b/frontend/src/lib/components/apps/components/buttons/AppFormButton.svelte
index 7df3a76da4..f2d9498536 100644
--- a/frontend/src/lib/components/apps/components/buttons/AppFormButton.svelte
+++ b/frontend/src/lib/components/apps/components/buttons/AppFormButton.svelte
@@ -97,10 +97,11 @@
 	/>
 {/each}
 
-{#each Object.keys(components['formbuttoncomponent'].initialData.configuration) as key (key)}
+{#each Object.entries(components['formbuttoncomponent'].initialData.configuration) as [key, initialConfig] (key)}
 	<ResolveConfig
 		{id}
 		{key}
+		{initialConfig}
 		bind:resolvedConfig={resolvedConfig[key]}
 		configuration={configuration[key]}
 	/>
diff --git a/frontend/src/lib/components/apps/components/helpers/HiddenComponent.svelte b/frontend/src/lib/components/apps/components/helpers/HiddenComponent.svelte
index ee32c17726..c142174192 100644
--- a/frontend/src/lib/components/apps/components/helpers/HiddenComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/HiddenComponent.svelte
@@ -50,7 +50,7 @@
 		{runnable}
 		wrapperClass="hidden"
 		recomputableByRefreshButton={runnable.autoRefresh ?? true}
-		on:success={onSuccess}
+		onSuccess={(_r) => onSuccess()}
 		{outputs}
 	>
 		{@render children?.()}
diff --git a/frontend/src/lib/components/apps/components/helpers/InputValue.svelte b/frontend/src/lib/components/apps/components/helpers/InputValue.svelte
index 497a27d79b..c494e82cbb 100644
--- a/frontend/src/lib/components/apps/components/helpers/InputValue.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/InputValue.svelte
@@ -169,7 +169,7 @@
 			let nhash = typeof value != 'object' ? value : sum(value)
 			lastExprHash = nhash
 		} else if (input?.type == 'evalv2') {
-			// console.log('evalv2', onDemandOnly, field)
+			// console.log('evalv2', onDemandOnly, field, exportValueFunction, key)
 			if (onDemandOnly && exportValueFunction) {
 				value = (args?: any) => {
 					return evalExpr(input as EvalV2AppInput, args)
diff --git a/frontend/src/lib/components/apps/components/helpers/ResolveConfig.svelte b/frontend/src/lib/components/apps/components/helpers/ResolveConfig.svelte
index bd4e629a1e..a7198caaeb 100644
--- a/frontend/src/lib/components/apps/components/helpers/ResolveConfig.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/ResolveConfig.svelte
@@ -55,7 +55,7 @@
 {:else}
 	{#if debug}
 		<pre class="text-2xs">
-			key: {key} 
+			key: {key}
 			{JSON.stringify({ r: resolvedConfig })}
 			{JSON.stringify(configuration)}</pre
 		>
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index 0cba4bca16..68df0b0a47 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -72,6 +72,7 @@
 		overrideCallback?: (() => CancelablePromise<void>) | undefined
 		overrideAutoRefresh?: boolean
 		replaceCallback?: boolean
+		onSuccess?: (result: any) => void
 		children?: import('svelte').Snippet
 		nonRenderedPlaceholder?: import('svelte').Snippet
 	}
@@ -104,7 +105,8 @@
 		overrideAutoRefresh = false,
 		replaceCallback = false,
 		children,
-		nonRenderedPlaceholder
+		nonRenderedPlaceholder,
+		onSuccess
 	}: Props = $props()
 
 	const {
@@ -685,7 +687,7 @@
 		delete $errorByComponent[id]
 
 		if (dispatchSuccess) {
-			dispatch('success', result)
+			onSuccess?.(result)
 		}
 		// callbacks?.done(res)
 	}
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableWrapper.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableWrapper.svelte
index 0f4de82042..8d444d95af 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableWrapper.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableWrapper.svelte
@@ -223,7 +223,6 @@
 		if (!sideEffect) return
 
 		if (sideEffect.selected == 'none') return
-
 		await executeSideEffect(sideEffect, success, errorMessage)
 	}
 
@@ -389,8 +388,8 @@
 
 			initializing = false
 		}}
-		on:success={(e) => {
-			onSuccess(e.detail)
+		onSuccess={(result) => {
+			onSuccess(result)
 			handleSideEffect(true)
 		}}
 		on:handleError={(e) => handleSideEffect(false, e.detail)}