diff --git a/src/lib/components/filters/filters.svelte b/src/lib/components/filters/filters.svelte
index de0f4fa45..af3920fff 100644
--- a/src/lib/components/filters/filters.svelte
+++ b/src/lib/components/filters/filters.svelte
@@ -174,10 +174,7 @@
 
 <div class="is-only-mobile">
     <slot name="mobile" {disabled} toggle={toggleMobileModal}>
-        <Button
-            secondary
-            on:click={() => (showFiltersMobile = !showFiltersMobile)}
-            {fullWidthMobile}>
+        <Button secondary on:click={toggleMobileModal} {fullWidthMobile}>
             <i class="icon-filter u-opacity-50" />
             Filters
             {#if applied > 0}
diff --git a/src/lib/components/filters/tagList.svelte b/src/lib/components/filters/tagList.svelte
index a3df2bbb1..7747e0b3c 100644
--- a/src/lib/components/filters/tagList.svelte
+++ b/src/lib/components/filters/tagList.svelte
@@ -9,8 +9,9 @@
             content: tag?.value?.toString(),
             disabled: Array.isArray(tag.value) ? tag.value?.length < 3 : true
         }}
+        type="button"
         class="tag"
-        on:click={() => {
+        on:click|preventDefault={() => {
             queries.removeFilter(tag);
             queries.apply();
         }}>
diff --git a/src/lib/elements/forms/inputSelectSearch.svelte b/src/lib/elements/forms/inputSelectSearch.svelte
index 1889c4212..0e3b4a68c 100644
--- a/src/lib/elements/forms/inputSelectSearch.svelte
+++ b/src/lib/elements/forms/inputSelectSearch.svelte
@@ -27,6 +27,7 @@
     export let autofocus = false;
     export let interactiveOutput = false;
     export let interactiveEmpty = false;
+    export let hideEmpty = false;
     // stretch is used inside of a flex container to give the element flex:1
     export let stretch = true;
     export let search = '';
@@ -52,7 +53,8 @@
     });
 
     function handleInput() {
-        hasFocus = true;
+        if (hideEmpty && !options?.length) hasFocus = false;
+        else hasFocus = true;
     }
 
     function handleKeydown(event: KeyboardEvent) {
diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index b2782edc1..3d6410910 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -129,7 +129,8 @@
                             use:tooltip={{
                                 content: `Scheduled to execute on ${toLocaleDateTime(execution.scheduledAt)}`,
                                 disabled:
-                                    !execution?.scheduledAt || execution.status !== 'scheduled'
+                                    !execution?.scheduledAt || execution.status !== 'scheduled',
+                                maxWidth: 180
                             }}>
                             <Pill
                                 warning={execution.status === 'waiting' ||
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
index 825f4952b..7e0d3b4ef 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
@@ -34,7 +34,7 @@
             title: 'Status',
             type: 'enum',
             show: true,
-            width: 110,
+            width: 130,
             array: true,
             format: 'enum',
             elements: ['completed', 'failed', 'waiting', 'scheduled', 'processing', 'cancelled']
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
index ce2a76182..acc620d4d 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
@@ -213,14 +213,11 @@
                                             label="Key"
                                             placeholder="Select key"
                                             interactiveOutput
-                                            interactiveEmpty
+                                            hideEmpty
                                             options={filteredKeyList}
                                             id={`key-${index}`}
                                             bind:value={name}
                                             bind:search={name}>
-                                            <svelte:fragment slot="empty">
-                                                {name}
-                                            </svelte:fragment>
                                         </InputSelectSearch>
                                         <InputText
                                             isMultiple