diff --git a/client/web/workflow/src/components/Configurator/ExecWorkflow.vue b/client/web/workflow/src/components/Configurator/ExecWorkflow.vue
index 2d29b7729..115bc4659 100644
--- a/client/web/workflow/src/components/Configurator/ExecWorkflow.vue
+++ b/client/web/workflow/src/components/Configurator/ExecWorkflow.vue
@@ -66,6 +66,10 @@ export default {
     getWorkflowLabel ({ workflowID, handle, meta = {} }) {
       return meta.name || handle || workflowID
     },
+
+    getWorkflowKey ({ workflowID, handle }) {
+      return handle || workflowID
+    },
   },
 }
 </script>
diff --git a/client/web/workflow/src/components/Configurator/Function.vue b/client/web/workflow/src/components/Configurator/Function.vue
index 9fb331863..a5887c7d4 100644
--- a/client/web/workflow/src/components/Configurator/Function.vue
+++ b/client/web/workflow/src/components/Configurator/Function.vue
@@ -126,7 +126,7 @@
                     v-model="a.value"
                     :options="workflowOptions"
                     :get-option-label="getWorkflowLabel"
-                    :get-option-key="getOptionWorkflowKey"
+                    :get-option-key="getWorkflowKey"
                     :reduce="wf => a.type === 'ID' ? wf.workflowID : wf.handle"
                     :placeholder="$t('steps:function.configurator.search-workflow')"
                     @input="$root.$emit('change-detected')"
diff --git a/lib/vue/src/components/input/CInputSelect.vue b/lib/vue/src/components/input/CInputSelect.vue
index 8425c5e93..165c2f56c 100644
--- a/lib/vue/src/components/input/CInputSelect.vue
+++ b/lib/vue/src/components/input/CInputSelect.vue
@@ -10,7 +10,7 @@
     :append-to-body="appendToBody"
     class="bg-white rounded"
     :class="sizeClass"
-    @search="($event) => $emit('search', $event)"
+    @search="onSearch"
   >
     <template
       v-for="(_, name) in $scopedSlots"
@@ -135,6 +135,10 @@ export default {
        */
       return () => popper.destroy()
     },
+
+    onSearch (search, loading) {
+      this.$emit('search', search, loading)
+    },
   },
 }
 </script>