diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 8b1e52cef6..4c2e4d7211 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-36158ddebc1b77f47380d6bba59d70bc6d18b653
\ No newline at end of file
+d3e20c73b06a7c6820868769a49b5fa621591653
\ No newline at end of file
diff --git a/backend/windmill-api/src/apps.rs b/backend/windmill-api/src/apps.rs
index d5ac116531..0a8878fad6 100644
--- a/backend/windmill-api/src/apps.rs
+++ b/backend/windmill-api/src/apps.rs
@@ -1858,7 +1858,8 @@ async fn delete_s3_file_from_app(
 
     let s3_client = build_object_store_client(&s3_resource).await?;
 
-    let path = object_store::path::Path::from(file_key.as_str());
+    let path = object_store::path::Path::parse(file_key.as_str())
+        .map_err(|e| Error::internal_err(format!("Error parsing file key: {}", e)))?;
 
     s3_client.delete(&path).await.map_err(|err| {
         tracing::error!("Error deleting file: {:?}", err);
diff --git a/frontend/src/lib/components/DisplayResult.svelte b/frontend/src/lib/components/DisplayResult.svelte
index 999c57bb26..5eac69b8be 100644
--- a/frontend/src/lib/components/DisplayResult.svelte
+++ b/frontend/src/lib/components/DisplayResult.svelte
@@ -729,7 +729,8 @@
 											appPath
 												? 'apps_u/load_image_preview/' + appPath
 												: 'job_helpers/load_image_preview'
-										}?file_key=${result.s3}` + (result.storage ? `&storage=${result.storage}` : '')}
+										}?file_key=${encodeURIComponent(result.s3)}` +
+											(result.storage ? `&storage=${result.storage}` : '')}
 									/>
 								</div>
 							{:else if result?.s3?.endsWith('.pdf')}
@@ -740,7 +741,8 @@
 											appPath
 												? 'apps_u/load_image_preview/' + appPath
 												: 'job_helpers/load_image_preview'
-										}?file_key=${result.s3}` + (result.storage ? `&storage=${result.storage}` : '')}
+										}?file_key=${encodeURIComponent(result.s3)}` +
+											(result.storage ? `&storage=${result.storage}` : '')}
 									/>
 								</div>
 							{/if}
@@ -798,8 +800,9 @@
 											<img
 												alt="preview rendered"
 												class="w-auto h-full"
-												src={`/api/w/${workspaceId}/job_helpers/load_image_preview?file_key=${s3object.s3}` +
-													(s3object.storage ? `&storage=${s3object.storage}` : '')}
+												src={`/api/w/${workspaceId}/job_helpers/load_image_preview?file_key=${encodeURIComponent(
+													s3object.s3
+												)}` + (s3object.storage ? `&storage=${s3object.storage}` : '')}
 											/>
 										</div>
 									{:else}
@@ -815,8 +818,9 @@
 									<div class="h-96 mt-2 border">
 										<PdfViewer
 											allowFullscreen
-											source={`/api/w/${workspaceId}/job_helpers/load_image_preview?file_key=${s3object.s3}` +
-												(s3object.storage ? `&storage=${s3object.storage}` : '')}
+											source={`/api/w/${workspaceId}/job_helpers/load_image_preview?file_key=${encodeURIComponent(
+												s3object.s3
+											)}` + (s3object.storage ? `&storage=${s3object.storage}` : '')}
 										/>
 									</div>
 								{/if}
diff --git a/frontend/src/lib/components/ParqetCsvTableRenderer.svelte b/frontend/src/lib/components/ParqetCsvTableRenderer.svelte
index b5053b2307..1c50dfba2c 100644
--- a/frontend/src/lib/components/ParqetCsvTableRenderer.svelte
+++ b/frontend/src/lib/components/ParqetCsvTableRenderer.svelte
@@ -195,9 +195,9 @@
 	{#if !disable_download && !s3resource.endsWith('.csv')}
 		<a
 			target="_blank"
-			href="{base}/api/w/{workspaceId}/job_helpers/download_s3_parquet_file_as_csv?file_key={s3resource}{storage
-				? `&storage=${storage}`
-				: ''}"
+			href="{base}/api/w/{workspaceId}/job_helpers/download_s3_parquet_file_as_csv?file_key={encodeURIComponent(
+				s3resource
+			)}{storage ? `&storage=${storage}` : ''}"
 			class="text-secondary w-full text-right underline text-2xs whitespace-nowrap"
 			><div class="flex flex-row-reverse gap-2 items-center"><Download size={12} /> CSV</div></a
 		>
diff --git a/frontend/src/lib/components/S3FilePicker.svelte b/frontend/src/lib/components/S3FilePicker.svelte
index f08284e53f..3a8f964062 100644
--- a/frontend/src/lib/components/S3FilePicker.svelte
+++ b/frontend/src/lib/components/S3FilePicker.svelte
@@ -108,13 +108,7 @@
 		if (!firstLoad) {
 			timeout && clearTimeout(timeout)
 			timeout = setTimeout(() => {
-				page = 0
-				count = 0
-				displayedCount = 0
-				allFilesByKey = {}
-				displayedFileKeys = []
-				listMarkers = []
-				loadFiles()
+				clearAndLoadFiles({ keepFilter: true })
 			}, 500)
 		} else {
 			firstLoad = false
@@ -286,7 +280,6 @@
 		fileInfoLoading = false
 	}
 
-	let render = 0
 	async function deleteFileFromS3(fileKey: string | undefined) {
 		fileDeletionInProgress = true
 		if (fileKey === undefined) {
@@ -303,12 +296,48 @@
 			deletionModalOpen = false
 		}
 		sendUserToast(`${fileKey} deleted from S3 bucket`)
-		displayedFileKeys = [...displayedFileKeys.filter((key) => key !== fileKey)]
-		delete allFilesByKey[fileKey]
-		filePreview = undefined
-		fileMetadata = undefined
 		selectedFileKey = { s3: '' }
-		render++
+		const currentPage = page
+		await clearAndLoadFiles()
+		for (let i = 0; i < currentPage; i++) {
+			page = i + 1
+			await loadFiles()
+		}
+		const fileKeyFolders = fileKey.split('/').slice(0, -1)
+		let current_path: string | undefined = undefined
+		for (let i = 0; i < fileKeyFolders.length; i++) {
+			current_path =
+				current_path === undefined ? fileKeyFolders[i] : current_path + fileKeyFolders[i]
+			if (i < fileKeyFolders.length) {
+				current_path += '/'
+			}
+			const folder = allFilesByKey[current_path]
+			if (folder) {
+				folder.collapsed = false
+			}
+			for (let file_key in allFilesByKey) {
+				let file_info = allFilesByKey[file_key]
+				if (file_info.parentPath === current_path) {
+					displayedFileKeys.push(file_key)
+				}
+			}
+		}
+		displayedFileKeys = displayedFileKeys.sort()
+	}
+
+	async function clearAndLoadFiles({ keepFilter }: { keepFilter?: boolean } = {}) {
+		displayedFileKeys = []
+		allFilesByKey = {}
+		count = 0
+		displayedCount = 0
+		page = 0
+		listMarkers = []
+		fileMetadata = undefined
+		filePreview = undefined
+		if (keepFilter) {
+			filter = ''
+		}
+		await loadFiles()
 	}
 
 	async function moveS3File(srcFileKey: string | undefined, destFileKey: string | undefined) {
@@ -329,7 +358,7 @@
 		}
 		sendUserToast(`${srcFileKey} moved to ${destFileKey}`)
 		selectedFileKey = { s3: destFileKey! }
-		await loadFiles()
+		await clearAndLoadFiles()
 		await loadFileMetadataPlusPreviewAsync(selectedFileKey.s3)
 	}
 
@@ -342,15 +371,6 @@
 			initialFileKey = { ...preSelectedFileKey }
 			selectedFileKey = { ...preSelectedFileKey }
 		}
-		displayedFileKeys = []
-		allFilesByKey = {}
-		count = 0
-		displayedCount = 0
-		page = 0
-		filter = ''
-		listMarkers = []
-		fileMetadata = undefined
-		filePreview = undefined
 		reloadContent()
 		drawer.openDrawer?.()
 	}
@@ -372,7 +392,7 @@
 			workspaceSettingsInitialized = false
 			return
 		}
-		await loadFiles() // TODO: Potentially load only on the first open and add a refresh button
+		await clearAndLoadFiles()
 		if (selectedFileKey !== undefined) {
 			if (allFilesByKey[selectedFileKey.s3] === undefined) {
 				selectedFileKey = { s3: '' }
@@ -513,62 +533,58 @@
 							</div>
 						{:else}
 							<div class="grow" bind:clientHeight={listDivHeight}>
-								{#key render}
-									<VirtualList
-										width="100%"
-										height={listDivHeight}
-										itemCount={displayedFileKeys.length}
-										itemSize={42}
+								<VirtualList
+									width="100%"
+									height={listDivHeight}
+									itemCount={displayedFileKeys.length}
+									itemSize={42}
+								>
+									<div
+										slot="item"
+										let:index
+										let:style
+										{style}
+										class={twMerge(
+											'hover:bg-surface-hover border-b',
+											index === displayedFileKeys.length - 1 && 'border-b-0'
+										)}
 									>
-										<div
-											slot="item"
-											let:index
-											let:style
-											{style}
-											class={twMerge(
-												'hover:bg-surface-hover border-b',
-												index === displayedFileKeys.length - 1 && 'border-b-0'
-											)}
-										>
-											{@const file_info = allFilesByKey[displayedFileKeys[index]]}
-											{#if file_info}
+										{@const file_info = allFilesByKey[displayedFileKeys[index]]}
+										{#if file_info}
+											<div
+												on:click={() => selectItem(index)}
+												class={twMerge(
+													'flex flex-row h-full font-semibold text-xs items-center justify-start',
+													selectedFileKey !== undefined && selectedFileKey.s3 === file_info.full_key
+														? 'bg-surface-hover'
+														: ''
+												)}
+											>
 												<div
-													on:click={() => selectItem(index)}
-													class={twMerge(
-														'flex flex-row h-full font-semibold text-xs items-center justify-start',
-														selectedFileKey !== undefined &&
-															selectedFileKey.s3 === file_info.full_key
-															? 'bg-surface-hover'
-															: ''
-													)}
+													class={`flex flex-row w-full gap-2 h-full items-center`}
+													style={`margin-left: ${(2 + file_info.nestingLevel) * 0.25}rem;`}
 												>
-													<div
-														class={`flex flex-row w-full gap-2 h-full items-center`}
-														style={`margin-left: ${(2 + file_info.nestingLevel) * 0.25}rem;`}
-													>
-														{#if file_info.type === 'folder'}
-															{#if file_info.collapsed}<FolderClosed size={16} />{:else}<FolderOpen
-																	size={16}
-																/>{/if}
-															<div class="truncate text-ellipsis w-56">
-																{file_info.display_name} ({file_info.count}{count % 1000 === 0 &&
-																lastKeyFolders[file_info.nestingLevel / 2] ===
-																	file_info.display_name
-																	? '+'
-																	: ''} item{file_info.count === 1 ? '' : 's'})
-															</div>
-														{:else}
-															<FileIcon size={16} />
-															<div class="truncate text-ellipsis w-56">
-																{file_info.display_name}
-															</div>
-														{/if}
-													</div>
+													{#if file_info.type === 'folder'}
+														{#if file_info.collapsed}<FolderClosed size={16} />{:else}<FolderOpen
+																size={16}
+															/>{/if}
+														<div class="truncate text-ellipsis w-56">
+															{file_info.display_name} ({file_info.count}{count % 1000 === 0 &&
+															lastKeyFolders[file_info.nestingLevel / 2] === file_info.display_name
+																? '+'
+																: ''} item{file_info.count === 1 ? '' : 's'})
+														</div>
+													{:else}
+														<FileIcon size={16} />
+														<div class="truncate text-ellipsis w-56">
+															{file_info.display_name}
+														</div>
+													{/if}
 												</div>
-											{/if}
-										</div>
-									</VirtualList>
-								{/key}
+											</div>
+										{/if}
+									</div>
+								</VirtualList>
 							</div>
 							<div
 								class="flex flex-col gap-2 text-2xs justify-center items-center text-secondary w-full border-t h-16"
@@ -621,9 +637,9 @@
 											title="Download file from S3"
 											variant="border"
 											color="light"
-											href={`${base}/api/w/${$workspaceStore}/job_helpers/download_s3_file?file_key=${
-												fileMetadata?.fileKey
-											}${storage ? `&storage=${storage}` : ''}`}
+											href={`${base}/api/w/${$workspaceStore}/job_helpers/download_s3_file?file_key=${encodeURIComponent(
+												fileMetadata?.fileKey ?? ''
+											)}${storage ? `&storage=${storage}` : ''}`}
 											download={fileMetadata?.fileKey.split('/').pop() ?? 'unnamed_download.file'}
 											startIcon={{ icon: Download }}
 											iconOnly={true}
@@ -661,73 +677,77 @@
 					{/if}
 
 					<div class="flex flex-col h-full w-full overflow-auto text-xs p-4 bg-surface-secondary">
-						{#if fileMetadata?.fileKey.endsWith('.png') || fileMetadata?.fileKey.endsWith('.jpg') || fileMetadata?.fileKey.endsWith('.jpeg') || fileMetadata?.fileKey.endsWith('.webp')}
-							<div>
-								<img
-									src={`/api/w/${$workspaceStore}/job_helpers/load_image_preview?file_key=${fileMetadata.fileKey}` +
-										(storage ? `&storage=${storage}` : '')}
-									alt="S3 preview"
-								/>
-							</div>
-						{:else if fileMetadata?.fileKey.endsWith('.pdf')}
-							<div class="w-full h-[950px] border">
-								<PdfViewer
-									source={`/api/w/${$workspaceStore}/job_helpers/load_image_preview?file_key=${fileMetadata.fileKey}` +
-										(storage ? `&storage=${storage}` : '')}
-								/>
-							</div>
-						{:else if filePreviewLoading}
-							<div class="flex h-6 items-center text-tertiary mb-4">
-								<Loader2 size={12} class="animate-spin mr-1" /> File preview loading
-							</div>
-						{:else if fileMetadata !== undefined && filePreview !== undefined}
-							<div class="flex items-center text-tertiary mb-4">
-								{#if filePreview.contentType === 'Unknown'}
-									Type of file not supported for preview.
-								{:else if filePreview.contentType === 'Csv'}
-									Previewing a {filePreview.contentType?.toLowerCase()} file. Separator character:
-									<div class="inline-flex w-12 ml-2 mr-2">
-										<select
-											class="h-8"
-											bind:value={csvSeparatorChar}
-											on:change={(e) =>
-												loadFilePreview(
-													fileMetadata?.fileKey ?? '',
-													fileMetadata?.size,
-													fileMetadata?.mimeType
-												)}
-										>
-											<option value=",">,</option>
-											<option value=";">;</option>
-											<option value="\t">\t</option>
-											<option value="|">|</option>
-										</select>
-									</div>
-									Header row:
-									<div class="inline-flex item-center w-4 ml-2 mr-2">
-										<input
-											on:focus
-											on:click
-											disabled={false}
-											type="checkbox"
-											id="csv-header"
-											class="h-5"
-											bind:checked={csvHasHeader}
-											on:change|stopPropagation={(e) =>
-												loadFilePreview(
-													fileMetadata?.fileKey ?? '',
-													fileMetadata?.size,
-													fileMetadata?.mimeType
-												)}
-										/>
-									</div>
-								{:else}
-									Previewing a {filePreview.contentType?.toLowerCase()} file.
-								{/if}
-							</div>
-							<pre class="grow whitespace-no-wrap break-words"
-								>{#if !emptyString(filePreview.contentPreview)}{filePreview.contentPreview}{:else if filePreview.contentType !== undefined}Preview impossible.{/if}
+						{#if filePreviewLoading || fileMetadata}
+							{#if fileMetadata?.fileKey.endsWith('.png') || fileMetadata?.fileKey.endsWith('.jpg') || fileMetadata?.fileKey.endsWith('.jpeg') || fileMetadata?.fileKey.endsWith('.webp')}
+								<div>
+									<img
+										src={`/api/w/${$workspaceStore}/job_helpers/load_image_preview?file_key=${encodeURIComponent(
+											fileMetadata.fileKey
+										)}` + (storage ? `&storage=${storage}` : '')}
+										alt="S3 preview"
+									/>
+								</div>
+							{:else if fileMetadata?.fileKey.endsWith('.pdf')}
+								<div class="w-full h-[950px] border">
+									<PdfViewer
+										source={`/api/w/${$workspaceStore}/job_helpers/load_image_preview?file_key=${encodeURIComponent(
+											fileMetadata.fileKey
+										)}` + (storage ? `&storage=${storage}` : '')}
+									/>
+								</div>
+							{:else if filePreviewLoading}
+								<div class="flex h-6 items-center text-tertiary mb-4">
+									<Loader2 size={12} class="animate-spin mr-1" /> File preview loading
+								</div>
+							{:else if fileMetadata !== undefined && filePreview !== undefined}
+								<div class="flex items-center text-tertiary mb-4">
+									{#if filePreview.contentType === 'Unknown'}
+										Type of file not supported for preview.
+									{:else if filePreview.contentType === 'Csv'}
+										Previewing a {filePreview.contentType?.toLowerCase()} file. Separator character:
+										<div class="inline-flex w-12 ml-2 mr-2">
+											<select
+												class="h-8"
+												bind:value={csvSeparatorChar}
+												on:change={(e) =>
+													loadFilePreview(
+														fileMetadata?.fileKey ?? '',
+														fileMetadata?.size,
+														fileMetadata?.mimeType
+													)}
+											>
+												<option value=",">,</option>
+												<option value=";">;</option>
+												<option value="\t">\t</option>
+												<option value="|">|</option>
+											</select>
+										</div>
+										Header row:
+										<div class="inline-flex item-center w-4 ml-2 mr-2">
+											<input
+												on:focus
+												on:click
+												disabled={false}
+												type="checkbox"
+												id="csv-header"
+												class="h-5"
+												bind:checked={csvHasHeader}
+												on:change|stopPropagation={(e) =>
+													loadFilePreview(
+														fileMetadata?.fileKey ?? '',
+														fileMetadata?.size,
+														fileMetadata?.mimeType
+													)}
+											/>
+										</div>
+									{:else}
+										Previewing a {filePreview.contentType?.toLowerCase()} file.
+									{/if}
+								</div>
+								<pre class="grow whitespace-no-wrap break-words"
+									>{#if !emptyString(filePreview.contentPreview)}{filePreview.contentPreview}{:else if filePreview.contentType !== undefined}Preview impossible.{/if}
 							</pre>
+							{/if}
 						{/if}
 					</div>
 				</div>
@@ -812,7 +832,7 @@
 		uploadModalOpen = false
 		if (evt.detail !== undefined && evt.detail !== null) {
 			selectedFileKey = { s3: evt.detail }
-			loadFiles()
+			await clearAndLoadFiles()
 			loadFileMetadataPlusPreviewAsync(evt.detail)
 		}
 	}}
diff --git a/frontend/src/lib/components/apps/components/helpers/eval.ts b/frontend/src/lib/components/apps/components/helpers/eval.ts
index 3e6b5cc522..bb737040bd 100644
--- a/frontend/src/lib/components/apps/components/helpers/eval.ts
+++ b/frontend/src/lib/components/apps/components/helpers/eval.ts
@@ -3,7 +3,11 @@ import { sendUserToast } from '$lib/toast'
 import { waitJob } from '$lib/components/waitJob'
 import { base } from '$lib/base'
 
-export function computeGlobalContext(world: World | undefined, id: string | undefined, extraContext: any = {}) {
+export function computeGlobalContext(
+	world: World | undefined,
+	id: string | undefined,
+	extraContext: any = {}
+) {
 	return {
 		...Object.fromEntries(
 			Object.entries(world?.outputsById ?? {})
@@ -29,15 +33,17 @@ function create_context_function_template(
 	return `
 return async function (context, state, createProxy, goto, setTab, recompute, globalRecompute, getAgGrid, setValue, setSelectedIndex, openModal, closeModal, open, close, validate, invalidate, validateAll, clearFiles, showToast, waitJob, askNewResource, downloadFile) {
 "use strict";
-${contextKeys && contextKeys.length > 0
-			? `let ${contextKeys.map((key) => ` ${key} = createProxy('${key}', context['${key}'])`)};`
-			: ``
-		}
-${hasReturnAsLastLine
-			? eval_string
-			: `
+${
+	contextKeys && contextKeys.length > 0
+		? `let ${contextKeys.map((key) => ` ${key} = createProxy('${key}', context['${key}'])`)};`
+		: ``
+}
+${
+	hasReturnAsLastLine
+		? eval_string
+		: `
 return ${eval_string.startsWith('return ') ? eval_string.substring(7) : eval_string}`
-		}
+}
 
 }                                                                                                                   
 `
@@ -278,9 +284,9 @@ export async function eval_like(
 
 			if (typeof input === 'object' && input.s3) {
 				const workspaceId = ((context ?? {}) as any).ctx?.workspace
-				const s3href = `${base}/api/w/${workspaceId}/job_helpers/download_s3_file?file_key=${
-					input?.s3
-				}${input?.storage ? `&storage=${input.storage}` : ''}`
+				const s3href = `${base}/api/w/${workspaceId}/job_helpers/download_s3_file?file_key=${encodeURIComponent(
+					input?.s3 ?? ''
+				)}${input?.storage ? `&storage=${input.storage}` : ''}`
 				downloadFile(s3href, filename || input.s3)
 			} else if (typeof input === 'string') {
 				if (input.startsWith('data:')) {
diff --git a/frontend/src/lib/components/common/fileDownload/FileDownload.svelte b/frontend/src/lib/components/common/fileDownload/FileDownload.svelte
index 2c80eea7ef..519acbb1d9 100644
--- a/frontend/src/lib/components/common/fileDownload/FileDownload.svelte
+++ b/frontend/src/lib/components/common/fileDownload/FileDownload.svelte
@@ -15,7 +15,9 @@ focus-within:border-blue-500 hover:bg-blue-50 dark:hover:bg-frost-900 focus-with
 duration-200 rounded-lg p-1 gap-2"
 	href={`${base}/api/w/${workspaceId ?? $workspaceStore}${
 		appPath ? `/apps_u/download_s3_file/${appPath}` : '/job_helpers/download_s3_file'
-	}?file_key=${s3object?.s3}${s3object?.storage ? `&storage=${s3object.storage}` : ''}`}
+	}?file_key=${encodeURIComponent(s3object?.s3 ?? '')}${
+		s3object?.storage ? `&storage=${s3object.storage}` : ''
+	}`}
 	download={s3object?.s3.split('/').pop() ?? 'unnamed_download.file'}
 >
 	<Download />
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index 79935129a2..a4a67cff73 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -201,9 +201,9 @@
 					{#if getTypeAsString(json) === 's3object'}
 						<a
 							class="text-secondary underline font-semibold text-2xs whitespace-nowrap ml-1 w-fit"
-							href={`/api/w/${$workspaceStore}/job_helpers/download_s3_file?file_key=${json?.s3}${
-								json?.storage ? `&storage=${json.storage}` : ''
-							}`}
+							href={`/api/w/${$workspaceStore}/job_helpers/download_s3_file?file_key=${encodeURIComponent(
+								json?.s3 ?? ''
+							)}${json?.storage ? `&storage=${json.storage}` : ''}`}
 							download={json?.s3.split('/').pop() ?? 'unnamed_download.file'}
 						>
 							<span class="flex items-center gap-1"><Download size={12} />download</span>