diff --git a/backend/.sqlx/query-ce4733a0460cbef39fb50f4ca9746944d4cd5057d27d09de9c5dc494e3123ab4.json b/backend/.sqlx/query-917afc04613a7d4373c9152b8ecaa946a2abfb3e5be437ee3b0aa05b3bd39702.json
similarity index 68%
rename from backend/.sqlx/query-ce4733a0460cbef39fb50f4ca9746944d4cd5057d27d09de9c5dc494e3123ab4.json
rename to backend/.sqlx/query-917afc04613a7d4373c9152b8ecaa946a2abfb3e5be437ee3b0aa05b3bd39702.json
index 8112e9e17f..b7c541f4b0 100644
--- a/backend/.sqlx/query-ce4733a0460cbef39fb50f4ca9746944d4cd5057d27d09de9c5dc494e3123ab4.json
+++ b/backend/.sqlx/query-917afc04613a7d4373c9152b8ecaa946a2abfb3e5be437ee3b0aa05b3bd39702.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE queue SET canceled = true,  canceled_by = $2, scheduled_for = now(), suspend = 0 WHERE workspace_id = $1 AND schedule_path IS NULL RETURNING id, running",
+  "query": "UPDATE queue SET canceled = true,  canceled_by = $2, scheduled_for = now(), suspend = 0 WHERE scheduled_for < now() AND workspace_id = $1 AND schedule_path IS NULL RETURNING id, running",
   "describe": {
     "columns": [
       {
@@ -25,5 +25,5 @@
       false
     ]
   },
-  "hash": "ce4733a0460cbef39fb50f4ca9746944d4cd5057d27d09de9c5dc494e3123ab4"
+  "hash": "917afc04613a7d4373c9152b8ecaa946a2abfb3e5be437ee3b0aa05b3bd39702"
 }
diff --git a/backend/.sqlx/query-da4525f02e83bdd0e2d9eb9c6a9b29a6bff4a32f3a4ac5581a0ce6eb465c97e9.json b/backend/.sqlx/query-da4525f02e83bdd0e2d9eb9c6a9b29a6bff4a32f3a4ac5581a0ce6eb465c97e9.json
deleted file mode 100644
index c68faa26d8..0000000000
--- a/backend/.sqlx/query-da4525f02e83bdd0e2d9eb9c6a9b29a6bff4a32f3a4ac5581a0ce6eb465c97e9.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE script SET restart_unless_cancelled = NULL WHERE hash = ANY($1) AND workspace_id = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8Array",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "da4525f02e83bdd0e2d9eb9c6a9b29a6bff4a32f3a4ac5581a0ce6eb465c97e9"
-}
diff --git a/backend/.sqlx/query-f179cefbceadc8c3dc6442c74dd1d9d57bee47919592d8c75cdeb38ba1c971cb.json b/backend/.sqlx/query-f179cefbceadc8c3dc6442c74dd1d9d57bee47919592d8c75cdeb38ba1c971cb.json
deleted file mode 100644
index 238798bffc..0000000000
--- a/backend/.sqlx/query-f179cefbceadc8c3dc6442c74dd1d9d57bee47919592d8c75cdeb38ba1c971cb.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE script SET restart_unless_cancelled = true WHERE hash = ANY($1) AND workspace_id = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8Array",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "f179cefbceadc8c3dc6442c74dd1d9d57bee47919592d8c75cdeb38ba1c971cb"
-}
diff --git a/frontend/src/lib/components/RunPageSchedules.svelte b/frontend/src/lib/components/RunPageSchedules.svelte
index 77bca59530..cab826717d 100644
--- a/frontend/src/lib/components/RunPageSchedules.svelte
+++ b/frontend/src/lib/components/RunPageSchedules.svelte
@@ -95,7 +95,7 @@
 {#if schedule}
 	<div class="p-2 flex flex-col gap-2">
 		<div class="flex flex-row justify-between h-8">
-			<div class="flex flex-row gap-2">
+			<div class="flex flex-row gap-2 items-center">
 				<input
 					class="inline-block !w-32"
 					type="text"
@@ -105,14 +105,16 @@
 					value={schedule.schedule}
 					disabled={true}
 				/>
-				<Badge color="indigo" small
-					>Primary schedule&nbsp;<Tooltip
-						>Share the same path as the script or flow it is attached to and its path get renamed
-						whenever the source path is renamed</Tooltip
-					></Badge
-				>
+				<div>
+					<Badge color="indigo" small
+						>Primary&nbsp;<Tooltip light
+							>Share the same path as the script or flow it is attached to and its path get renamed
+							whenever the source path is renamed</Tooltip
+						></Badge
+					>
+				</div>
 			</div>
-			<div class="flex flex-row gap-2">
+			<div class="flex flex-row gap-2 items-center">
 				<Toggle
 					checked={schedule.enabled}
 					on:change={(e) => {
diff --git a/frontend/src/lib/components/ScheduleEditorInner.svelte b/frontend/src/lib/components/ScheduleEditorInner.svelte
index f4fb2aaaf2..9ae5ad4a60 100644
--- a/frontend/src/lib/components/ScheduleEditorInner.svelte
+++ b/frontend/src/lib/components/ScheduleEditorInner.svelte
@@ -435,7 +435,13 @@
 				<div class="mt-6">
 					{#if runnable}
 						{#if runnable?.schema && runnable.schema.properties && Object.keys(runnable.schema.properties).length > 0}
-							<SchemaForm disabled={!can_write} schema={runnable.schema} bind:isValid bind:args />
+							<SchemaForm
+								showReset
+								disabled={!can_write}
+								schema={runnable.schema}
+								bind:isValid
+								bind:args
+							/>
 						{:else}
 							<div class="text-xs texg-gray-700">
 								This {is_flow ? 'flow' : 'script'} takes no argument
diff --git a/frontend/src/lib/components/SchemaForm.svelte b/frontend/src/lib/components/SchemaForm.svelte
index 77d1edfc3c..b094ed2300 100644
--- a/frontend/src/lib/components/SchemaForm.svelte
+++ b/frontend/src/lib/components/SchemaForm.svelte
@@ -33,6 +33,7 @@
 	export let prettifyHeader = false
 	export let disablePortal = false
 	export let showSchemaExplorer = false
+	export let showReset = false
 
 	let clazz: string = ''
 	export { clazz as class }
@@ -43,6 +44,17 @@
 		args = {}
 	}
 
+	export function setDefaults() {
+		const nargs = {}
+
+		Object.keys(schema?.properties ?? {}).forEach((key) => {
+			if (schema?.properties[key].default != undefined && args[key] == undefined) {
+				nargs[key] = schema?.properties[key].default
+			}
+		})
+		args = nargs
+	}
+
 	function removeExtraKey() {
 		const nargs = {}
 		Object.keys(args ?? {}).forEach((key) => {
@@ -79,6 +91,13 @@
 	loadResourceTypes()
 </script>
 
+{#if showReset}
+	<div class="flex flex-row-reverse w-full">
+		<Button size="xs" color="light" on:click={() => setDefaults()}
+			>Reset args to runnable's defaults</Button
+		>
+	</div>
+{/if}
 <div class="w-full {clazz} {flexWrap ? 'flex flex-row flex-wrap gap-x-6 gap-y-2' : ''}">
 	{#if keys.length > 0}
 		{#each keys as argName, i (argName)}