diff --git a/src/components/newtab/workflow/WorkflowEditBlock.vue b/src/components/newtab/workflow/WorkflowEditBlock.vue
index 037548c28..23445852d 100644
--- a/src/components/newtab/workflow/WorkflowEditBlock.vue
+++ b/src/components/newtab/workflow/WorkflowEditBlock.vue
@@ -1,9 +1,9 @@
 <template>
-  <div id="workflow-edit-block" class="scroll h-full overflow-auto px-4 pb-1">
+  <div id="workflow-edit-block" class="scroll h-full overflow-auto px-4 py-1">
     <div
       class="sticky top-0 z-20 mb-2 flex items-center space-x-2 bg-white pb-4 dark:bg-gray-800"
     >
-      <button @click="$emit('close')">
+      <button @click="handleClose">
         <v-remixicon name="riArrowLeftLine" />
       </button>
       <p class="inline-block font-semibold capitalize">
@@ -35,9 +35,10 @@
   </div>
 </template>
 <script setup>
+import customEditComponents from '@business/blocks/editComponents';
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import customEditComponents from '@business/blocks/editComponents';
+import { useToast } from 'vue-toastification';
 
 const editComponents = require.context(
   './edit',
@@ -78,6 +79,7 @@ const props = defineProps({
 const emit = defineEmits(['close', 'update', 'update:autocomplete']);
 
 const { t, te } = useI18n();
+const toast = useToast();
 
 const blockData = computed({
   get() {
@@ -88,6 +90,50 @@ const blockData = computed({
   },
 });
 
+function isGoogleSheetsBlock() {
+  return ['google-sheets'].includes(props.data.id);
+}
+
+function validateBeforeClose() {
+  // 检查是否为Google Sheets相关区块
+  if (isGoogleSheetsBlock()) {
+    // 检查spreadsheetId是否为空，且不是create或add-sheet操作
+    const { spreadsheetId, type, range } = blockData.value;
+    const isNotCreateAction = !['create', 'add-sheet'].includes(type);
+
+    if (isNotCreateAction) {
+      const errors = [];
+
+      if (!spreadsheetId) {
+        errors.push(
+          t(
+            'workflow.blocks.google-sheets.spreadsheetId.required',
+            'Spreadsheet ID is required'
+          )
+        );
+      }
+
+      if (!range) {
+        errors.push(
+          t('workflow.blocks.google-sheets.range.required', 'Range is required')
+        );
+      }
+
+      if (errors.length > 0) {
+        errors.forEach((error) => toast.error(error));
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+function handleClose() {
+  if (validateBeforeClose()) {
+    emit('close');
+  }
+}
+
 function getEditComponent() {
   const editComp = props.data.editComponent;
   if (typeof editComp === 'object') return editComp;
diff --git a/src/components/newtab/workflow/edit/EditGoogleSheets.vue b/src/components/newtab/workflow/edit/EditGoogleSheets.vue
index f4046c28b..932a8a365 100644
--- a/src/components/newtab/workflow/edit/EditGoogleSheets.vue
+++ b/src/components/newtab/workflow/edit/EditGoogleSheets.vue
@@ -56,6 +56,10 @@
         :model-value="data.range"
         class="mt-1 w-full"
         placeholder="Sheet1!A1:B2"
+        :class="{
+          'border-red-500':
+            !data.range && !['create', 'add-sheet'].includes(data.type),
+        }"
         @change="updateData({ range: $event })"
       >
         <template #label>
@@ -69,6 +73,17 @@
             <v-remixicon name="riInformationLine" size="18" class="inline" />
           </a>
         </template>
+        <template
+          v-if="!data.range && !['create', 'add-sheet'].includes(data.type)"
+          #footer
+        >
+          <span class="text-red-500 text-sm">{{
+            t(
+              'workflow.blocks.google-sheets.range.required',
+              'Range is required'
+            )
+          }}</span>
+        </template>
       </ui-input>
     </edit-autocomplete>
     <template v-if="data.type === 'get'">
@@ -215,12 +230,12 @@
   </div>
 </template>
 <script setup>
-import { shallowReactive, defineAsyncComponent } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useToast } from 'vue-toastification';
 import { fetchApi } from '@/utils/api';
-import { convert2DArrayToArrayObj, debounce } from '@/utils/helper';
 import googleSheetsApi from '@/utils/googleSheetsApi';
+import { convert2DArrayToArrayObj, debounce } from '@/utils/helper';
+import { defineAsyncComponent, shallowReactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useToast } from 'vue-toastification';
 import EditAutocomplete from './EditAutocomplete.vue';
 import InsertWorkflowData from './InsertWorkflowData.vue';
 
@@ -272,6 +287,21 @@ const state = shallowReactive({
 
 const checkPermission = debounce(async (value) => {
   try {
+    if (!value.trim()) {
+      toast.error('Spreadsheet id is empty');
+      return;
+    }
+
+    if (
+      value.includes('://') ||
+      value.startsWith('http') ||
+      value.startsWith('www.') ||
+      value.includes('docs.google.com')
+    ) {
+      toast.error('Spreadsheet id is invalid');
+      return;
+    }
+
     if (state.lastSheetId === value) return;
 
     const response = await fetchApi(
@@ -298,7 +328,7 @@ async function previewData() {
       spreadsheetId: props.data.spreadsheetId,
     };
 
-    if (!props.data.spreadsheetId) {
+    if (!props.data.spreadsheetId.trim()) {
       toast.error(
         props.googleDrive
           ? 'No spreadsheet is selected'
@@ -307,6 +337,16 @@ async function previewData() {
       previewDataState.status = 'idle';
       return;
     }
+
+    if (
+      props.data.spreadsheetId.includes('http') ||
+      props.data.spreadsheetId.includes('spreadsheets')
+    ) {
+      toast.error('Spreadsheet Id is invalid, please check it');
+      previewDataState.status = 'idle';
+      return;
+    }
+
     if (!props.data.range) {
       toast.error('Spreadsheet range is empty');
       previewDataState.status = 'idle';
diff --git a/src/components/newtab/workflow/edit/EditPressKey.vue b/src/components/newtab/workflow/edit/EditPressKey.vue
index 8912a2369..b00811147 100644
--- a/src/components/newtab/workflow/edit/EditPressKey.vue
+++ b/src/components/newtab/workflow/edit/EditPressKey.vue
@@ -85,11 +85,11 @@
   </div>
 </template>
 <script setup>
-import { ref, onBeforeUnmount } from 'vue';
-import { useI18n } from 'vue-i18n';
+import SharedElSelectorActions from '@/components/newtab/shared/SharedElSelectorActions.vue';
 import { keyDefinitions } from '@/utils/USKeyboardLayout';
 import { recordPressedKey } from '@/utils/recordKeys';
-import SharedElSelectorActions from '@/components/newtab/shared/SharedElSelectorActions.vue';
+import { onBeforeUnmount, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
 import EditAutocomplete from './EditAutocomplete.vue';
 
 const props = defineProps({
@@ -100,10 +100,12 @@ const props = defineProps({
 });
 const emit = defineEmits(['update:data']);
 
+const spaceKeys = ['\r', '\n', ' ', '\u0000'];
+
 const includedKeys = ['Enter', 'Control', 'Meta', 'Shift', 'Alt', 'Space'];
-const filteredDefinitions = Object.keys(keyDefinitions).filter(
-  (key) => key.trim().length <= 1 || key.startsWith('Arrow')
-);
+const filteredDefinitions = Object.keys(keyDefinitions)
+  .filter((key) => key.trim().length <= 1 || key.startsWith('Arrow'))
+  .filter((key) => !spaceKeys.includes(key));
 const keysList = filteredDefinitions.concat(includedKeys);
 
 const { t } = useI18n();
diff --git a/src/components/newtab/workflow/editor/EditorLocalActions.vue b/src/components/newtab/workflow/editor/EditorLocalActions.vue
index 0639a9456..f02db7438 100644
--- a/src/components/newtab/workflow/editor/EditorLocalActions.vue
+++ b/src/components/newtab/workflow/editor/EditorLocalActions.vue
@@ -528,7 +528,9 @@ async function setAsHostWorkflow(isHost) {
 
   try {
     let url = '/me/workflows';
-    let payload = {};
+    let payload = {
+      auth: true,
+    };
 
     if (isHost) {
       const workflowPaylod = convertWorkflow(props.workflow, ['id']);
diff --git a/src/components/newtab/workflows/WorkflowsShared.vue b/src/components/newtab/workflows/WorkflowsShared.vue
index 147f52647..38fb40d73 100644
--- a/src/components/newtab/workflows/WorkflowsShared.vue
+++ b/src/components/newtab/workflows/WorkflowsShared.vue
@@ -1,19 +1,35 @@
 <template>
-  <shared-card
-    v-for="workflow in workflows"
-    :key="workflow.id"
-    :data="workflow"
-    :show-details="false"
-    @execute="RendererWorkflowService.executeWorkflow(workflow)"
-    @click="$router.push(`/workflows/${$event.id}/shared`)"
-  />
+  <div
+    v-if="workflows.length === 0"
+    class="md:flex items-center md:text-left text-center py-12"
+  >
+    <img src="@/assets/svg/alien.svg" class="w-96" />
+    <div class="ml-4">
+      <h1 class="mb-6 max-w-md text-2xl font-semibold">
+        {{ t('message.empty') }}
+      </h1>
+    </div>
+  </div>
+  <div v-else class="workflows-container">
+    <shared-card
+      v-for="workflow in workflows"
+      :key="workflow.id"
+      :data="workflow"
+      :show-details="false"
+      @execute="RendererWorkflowService.executeWorkflow(workflow)"
+      @click="$router.push(`/workflows/${$event.id}/shared`)"
+    />
+  </div>
 </template>
 <script setup>
-import { computed } from 'vue';
-import { useSharedWorkflowStore } from '@/stores/sharedWorkflow';
-import { arraySorter } from '@/utils/helper';
 import SharedCard from '@/components/newtab/shared/SharedCard.vue';
 import RendererWorkflowService from '@/service/renderer/RendererWorkflowService';
+import { useSharedWorkflowStore } from '@/stores/sharedWorkflow';
+import { arraySorter } from '@/utils/helper';
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
 
 const props = defineProps({
   search: {
diff --git a/src/content/blocksHandler/handlerForms.js b/src/content/blocksHandler/handlerForms.js
index 4b6495242..96d6432e2 100644
--- a/src/content/blocksHandler/handlerForms.js
+++ b/src/content/blocksHandler/handlerForms.js
@@ -1,5 +1,6 @@
 import handleFormElement from '@/utils/handleFormElement';
 import { sendMessage } from '@/utils/message';
+import renderString from '@/workflowEngine/templating/renderString';
 import handleSelector, { markElement } from '../handleSelector';
 import synchronizedLock from '../synchronizedLock';
 
@@ -45,10 +46,12 @@ async function forms(block) {
           );
         }
 
-        const commands = data.value.split('').map((char) => ({
-          type: 'keyDown',
-          text: char === '\n' ? '\r' : char,
-        }));
+        const commands = renderString(data.value)
+          .split('')
+          .map((char) => ({
+            type: 'keyDown',
+            text: char === '\n' ? '\r' : char,
+          }));
         const typeDelay = +block.data.delay;
         await sendMessage(
           'debugger:type',
diff --git a/src/locales/en/blocks.json b/src/locales/en/blocks.json
index b5d6fa401..5a35ff1a6 100644
--- a/src/locales/en/blocks.json
+++ b/src/locales/en/blocks.json
@@ -438,11 +438,13 @@
         },
         "spreadsheetId": {
           "label": "Spreadsheet Id",
-          "link": "See how to get spreadsheet Id"
+          "link": "See how to get spreadsheet Id",
+          "required": "Spreadsheet ID is required"
         },
         "range": {
           "label": "Range",
-          "link": "Click to see more examples"
+          "link": "Click to see more examples",
+          "required": "Range is required"
         },
         "select": {
           "get": "Get spreadsheet cell values",
diff --git a/src/locales/en/newtab.json b/src/locales/en/newtab.json
index 2cf0a7263..e990883a2 100644
--- a/src/locales/en/newtab.json
+++ b/src/locales/en/newtab.json
@@ -276,7 +276,8 @@
       },
       "messages": {
         "hostExist": "You have already added this host",
-        "notFound": "Can't find a hosted workflow with the ID \"{id}\""
+        "notFound": "Can't find a hosted workflow with the ID \"{id}\"",
+        "successAdded": "Successfully added hosted workflow with the ID \"{id}\""
       }
     },
     "type": {
@@ -298,7 +299,8 @@
       "edit": "Edit description",
       "fetchLocal": "Fetch local workflow",
       "update": "Update",
-      "unpublish": "Unpublish"
+      "unpublish": "Unpublish",
+      "linkCopied": "Link copied to clipboard"
     },
     "variables": {
       "title": "Variable | Variables",
diff --git a/src/locales/es/newtab.json b/src/locales/es/newtab.json
index 1b5d91866..5c87909c0 100644
--- a/src/locales/es/newtab.json
+++ b/src/locales/es/newtab.json
@@ -276,7 +276,8 @@
       },
       "messages": {
         "hostExist": "Ya ha añadido este host",
-        "notFound": "No se puede encontrar un flujo de trabajo alojado con el ID \"{id}\""
+        "notFound": "No se puede encontrar un flujo de trabajo alojado con el ID \"{id}\"",
+        "successAdded": "Flujo de trabajo anfitrión añadido con éxito con el ID \"{id}\""
       }
     },
     "type": {
@@ -298,7 +299,8 @@
       "edit": "Editar descripción",
       "fetchLocal": "Obtener flujo de trabajo local",
       "update": "Actualización",
-      "unpublish": "Anule la publicación"
+      "unpublish": "Anule la publicación",
+      "linkCopied": "Enlace copiado al portapapeles"
     },
     "variables": {
       "title": "Variable | Variables",
diff --git a/src/locales/fr/newtab.json b/src/locales/fr/newtab.json
index 894a8f0b8..8ee0bb69d 100644
--- a/src/locales/fr/newtab.json
+++ b/src/locales/fr/newtab.json
@@ -90,7 +90,8 @@
       },
       "messages": {
         "hostExist": "Vous avez déjà ajouté cet hôte",
-        "notFound": "Impossible de trouver le workflow hébergé avec l'identifiant \"{id}\""
+        "notFound": "Impossible de trouver le workflow hébergé avec l'identifiant \"{id}\"",
+        "successAdded": "Workflow hébergé ajouté avec succès avec l'identifiant \"{id}\""
       }
     },
     "type": {
@@ -112,7 +113,8 @@
       "edit": "Éditer la description",
       "fetchLocal": "Récupérer le workflow local",
       "update": "Mettre à jour",
-      "unpublish": "Annuler la publication"
+      "unpublish": "Annuler la publication",
+      "linkCopied": "Lien copié dans le presse-papiers"
     },
     "variables": {
       "title": "Variable | Variables",
diff --git a/src/locales/it/newtab.json b/src/locales/it/newtab.json
index 5c50fc568..3c8bd5e07 100644
--- a/src/locales/it/newtab.json
+++ b/src/locales/it/newtab.json
@@ -238,7 +238,8 @@
       },
       "messages": {
         "hostExist": "Hai già aggiunto questo host",
-        "notFound": "Impossibile trovare un workflow ospitato con l'ID \"{id}\""
+        "notFound": "Impossibile trovare un workflow ospitato con l'ID \"{id}\"",
+        "successAdded": "Workflow ospitato aggiunto con successo con l'ID \"{id}\""
       }
     },
     "type": {
@@ -260,7 +261,8 @@
       "edit": "Modifica descrizione",
       "fetchLocal": "Recupera workflow locale",
       "update": "Aggiorna",
-      "unpublish": "Annulla pubblicazione"
+      "unpublish": "Annulla pubblicazione",
+      "linkCopied": "Link copiato negli appunti"
     },
     "variables": {
       "title": "Variabile | Variabili",
diff --git a/src/locales/tr/newtab.json b/src/locales/tr/newtab.json
index 4b5a35605..3399b1915 100644
--- a/src/locales/tr/newtab.json
+++ b/src/locales/tr/newtab.json
@@ -275,7 +275,8 @@
       },
       "messages": {
         "hostExist": "Bu ana bilgisayarı zaten eklediniz",
-        "notFound": "Kimliği \"{id}\" olan barındırılan bir iş akışı bulunamıyor"
+        "notFound": "Kimliği \"{id}\" olan barındırılan bir iş akışı bulunamıyor",
+        "successAdded": "Kimliği \"{id}\" olan barındırılan iş akışı başarıyla eklendi"
       }
     },
     "type": {
@@ -297,7 +298,8 @@
       "edit": "Açıklamayı düzenle",
       "fetchLocal": "Yerel iş akışını getir",
       "update": "Güncelle",
-      "unpublish": "Yayından kaldır"
+      "unpublish": "Yayından kaldır",
+      "linkCopied": "Bağlantı kopyalandı"
     },
     "variables": {
       "title": "Değişken | Değişkenler",
@@ -512,6 +514,6 @@
       "of": "toplam {page}"
     }
   }
-  
+
 
 }
diff --git a/src/locales/uk/newtab.json b/src/locales/uk/newtab.json
index 20880f1b3..ac437543d 100644
--- a/src/locales/uk/newtab.json
+++ b/src/locales/uk/newtab.json
@@ -237,7 +237,8 @@
       },
       "messages": {
         "hostExist": "Ви вже додали цей хост",
-        "notFound": "Не вдається знайти розміщений робочий процес з ідентифікатором \"{id}\""
+        "notFound": "Не вдається знайти розміщений робочий процес з ідентифікатором \"{id}\"",
+        "successAdded": "Розміщений робочий процес успішно доданий з ідентифікатором \"{id}\""
       }
     },
     "type": {
@@ -259,7 +260,8 @@
       "edit": "Редагувати опис",
       "fetchLocal": "Отримати локальний робочий процес",
       "update": "Оновити",
-      "unpublish": "Скасувати публікацію"
+      "unpublish": "Скасувати публікацію",
+      "linkCopied": "Посилання скопійовано в буфер обміну"
     },
     "variables": {
       "title": "Змінна | Змінні",
diff --git a/src/locales/vi/newtab.json b/src/locales/vi/newtab.json
index 6b247a74e..ea93b28b4 100644
--- a/src/locales/vi/newtab.json
+++ b/src/locales/vi/newtab.json
@@ -233,7 +233,8 @@
       },
       "messages": {
         "hostExist": "Bạn đã thêm máy chủ này",
-        "notFound": "Không thể tìm thấy quy trình làm việc được lưu trữ với id \"{id} \""
+        "notFound": "Không thể tìm thấy quy trình làm việc được lưu trữ với id \"{id} \"",
+        "successAdded": "Quy trình làm việc được lưu trữ với id \"{id} \" đã được thêm thành công"
       }
     },
     "type": {
@@ -255,7 +256,8 @@
       "edit": "Chỉnh sửa Mô tả",
       "fetchLocal": "Tìm nạp quy trình làm việc cục bộ",
       "update": "Cập nhật",
-      "unpublish": "Hủy xuất bản"
+      "unpublish": "Hủy xuất bản",
+      "linkCopied": "Liên kết đã được sao chép vào bộ nhớ"
     },
     "variables": {
       "title": "Biến | Danh sách biến",
diff --git a/src/locales/zh-TW/newtab.json b/src/locales/zh-TW/newtab.json
index 49a12fd4b..eb97f3ee0 100644
--- a/src/locales/zh-TW/newtab.json
+++ b/src/locales/zh-TW/newtab.json
@@ -276,7 +276,8 @@
               },
               "messages": {
                 "hostExist": "您已經新增過此主機",
-                "notFound": "找不到 ID 為 \"{id}\" 的託管工作流程"
+                "notFound": "找不到 ID 為 \"{id}\" 的託管工作流程",
+                "successAdded": "託管工作流程 \"{id}\" 已新增成功"
               }
             },
               "type": {
@@ -298,7 +299,8 @@
                 "edit": "編輯描述",
                 "fetchLocal": "提取本機工作流程",
                 "update": "更新",
-                "unpublish": "取消發布"
+                "unpublish": "取消發布",
+                "linkCopied": "連結已複製到剪貼簿"
               },
               "variables": {
                 "title": "變數 | 變數們",
@@ -514,4 +516,3 @@
                 }
               }
             }
-           
\ No newline at end of file
diff --git a/src/locales/zh/newtab.json b/src/locales/zh/newtab.json
index 23cc5d34f..430715779 100644
--- a/src/locales/zh/newtab.json
+++ b/src/locales/zh/newtab.json
@@ -94,7 +94,7 @@
     }
   },
   "auth": {
-    "title": "作者",
+    "title": "授权验证",
     "signIn": "登录",
     "username": "您需要先设置您的用户名",
     "clickHere": "点击这里",
@@ -276,7 +276,8 @@
       },
       "messages": {
         "hostExist": "您已添加此主机",
-        "notFound": "找不到托管工作流 \"{id}\" id"
+        "notFound": "找不到托管工作流 \"{id}\" id",
+        "successAdded": "托管工作流 \"{id}\" id 已添加成功"
       }
     },
     "type": {
@@ -298,7 +299,8 @@
       "edit": "编辑详细描述",
       "fetchLocal": "获取本地工作流",
       "update": "更新",
-      "unpublish": "取消发布"
+      "unpublish": "取消发布",
+      "linkCopied": "链接已复制到剪贴板"
     },
     "variables": {
       "title": "变量 | 变量",
diff --git a/src/newtab/pages/workflows/Shared.vue b/src/newtab/pages/workflows/Shared.vue
index a33524b34..9234ee931 100644
--- a/src/newtab/pages/workflows/Shared.vue
+++ b/src/newtab/pages/workflows/Shared.vue
@@ -35,7 +35,7 @@
           prepend-icon="riLinkM"
           :model-value="`https://automa.site/workflow/${workflow.id}`"
           readonly
-          @click="$event.target.select()"
+          @click="copyLink"
         />
       </ui-card>
       <div class="pointer-events-none grow" />
@@ -149,20 +149,20 @@
   </ui-modal>
 </template>
 <script setup>
-import { reactive, onMounted, watch, shallowRef, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useHead } from '@vueuse/head';
-import { useRoute, useRouter } from 'vue-router';
-import { useToast } from 'vue-toastification';
-import browser from 'webextension-polyfill';
-import { fetchApi } from '@/utils/api';
+import WorkflowEditor from '@/components/newtab/workflow/WorkflowEditor.vue';
+import WorkflowShare from '@/components/newtab/workflow/WorkflowShare.vue';
 import { useDialog } from '@/composable/dialog';
 import { useGroupTooltip } from '@/composable/groupTooltip';
-import { useWorkflowStore } from '@/stores/workflow';
 import { useSharedWorkflowStore } from '@/stores/sharedWorkflow';
+import { useWorkflowStore } from '@/stores/workflow';
+import { fetchApi } from '@/utils/api';
 import convertWorkflowData from '@/utils/convertWorkflowData';
-import WorkflowShare from '@/components/newtab/workflow/WorkflowShare.vue';
-import WorkflowEditor from '@/components/newtab/workflow/WorkflowEditor.vue';
+import { useHead } from '@vueuse/head';
+import { computed, onMounted, reactive, shallowRef, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import { useToast } from 'vue-toastification';
+import browser from 'webextension-polyfill';
 
 useGroupTooltip();
 
@@ -358,6 +358,14 @@ function onEditorInit(instance) {
   editor.value = instance;
 }
 
+function copyLink(e) {
+  e.target.select();
+  navigator.clipboard.writeText(
+    `https://automa.site/workflow/${workflow.value.id}`
+  );
+  toast.success(t('workflow.share.linkCopied'));
+}
+
 watch(workflow, () => {
   state.editorKey += 1;
 });
diff --git a/src/newtab/pages/workflows/index.vue b/src/newtab/pages/workflows/index.vue
index 582648002..b7dfad66b 100644
--- a/src/newtab/pages/workflows/index.vue
+++ b/src/newtab/pages/workflows/index.vue
@@ -256,7 +256,7 @@
               :sort="{ by: state.sortBy, order: state.sortOrder }"
             />
           </ui-tab-panel>
-          <ui-tab-panel value="shared" class="workflows-container">
+          <ui-tab-panel value="shared">
             <workflows-shared
               :search="state.query"
               :sort="{ by: state.sortBy, order: state.sortOrder }"
@@ -367,28 +367,28 @@
   </div>
 </template>
 <script setup>
-import { computed, shallowReactive, watch, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useToast } from 'vue-toastification';
+import SharedPermissionsModal from '@/components/newtab/shared/SharedPermissionsModal.vue';
+import WorkflowsFolder from '@/components/newtab/workflows/WorkflowsFolder.vue';
+import WorkflowsHosted from '@/components/newtab/workflows/WorkflowsHosted.vue';
+import WorkflowsLocal from '@/components/newtab/workflows/WorkflowsLocal.vue';
+import WorkflowsShared from '@/components/newtab/workflows/WorkflowsShared.vue';
+import WorkflowsUserTeam from '@/components/newtab/workflows/WorkflowsUserTeam.vue';
 import { useDialog } from '@/composable/dialog';
-import { useShortcut } from '@/composable/shortcut';
 import { useGroupTooltip } from '@/composable/groupTooltip';
-import { fetchApi } from '@/utils/api';
+import { useShortcut } from '@/composable/shortcut';
+import recordWorkflow from '@/newtab/utils/startRecordWorkflow';
+import { useHostedWorkflowStore } from '@/stores/hostedWorkflow';
+import { useTeamWorkflowStore } from '@/stores/teamWorkflow';
 import { useUserStore } from '@/stores/user';
 import { useWorkflowStore } from '@/stores/workflow';
-import { useTeamWorkflowStore } from '@/stores/teamWorkflow';
-import { useHostedWorkflowStore } from '@/stores/hostedWorkflow';
+import { fetchApi } from '@/utils/api';
+import { findTriggerBlock, isWhitespace } from '@/utils/helper';
+import { getWorkflowPermissions, importWorkflow } from '@/utils/workflowData';
 import { registerWorkflowTrigger } from '@/utils/workflowTrigger';
-import { isWhitespace, findTriggerBlock } from '@/utils/helper';
-import { importWorkflow, getWorkflowPermissions } from '@/utils/workflowData';
-import recordWorkflow from '@/newtab/utils/startRecordWorkflow';
-import WorkflowsLocal from '@/components/newtab/workflows/WorkflowsLocal.vue';
-import WorkflowsShared from '@/components/newtab/workflows/WorkflowsShared.vue';
-import WorkflowsHosted from '@/components/newtab/workflows/WorkflowsHosted.vue';
-import WorkflowsFolder from '@/components/newtab/workflows/WorkflowsFolder.vue';
-import WorkflowsUserTeam from '@/components/newtab/workflows/WorkflowsUserTeam.vue';
-import SharedPermissionsModal from '@/components/newtab/shared/SharedPermissionsModal.vue';
+import { computed, onMounted, shallowReactive, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { useToast } from 'vue-toastification';
 
 useGroupTooltip();
 
@@ -402,7 +402,7 @@ const teamWorkflowStore = useTeamWorkflowStore();
 const hostedWorkflowStore = useHostedWorkflowStore();
 
 const sorts = ['name', 'createdAt', 'updatedAt', 'mostUsed'];
-const { teamId, active } = router.currentRoute.value.query;
+const { teamId, active: routeActive } = router.currentRoute.value.query;
 const savedSorts = JSON.parse(localStorage.getItem('workflow-sorts') || '{}');
 const validTeamId = userStore.user?.teams?.some(
   ({ id }) => id === teamId || id === +teamId
@@ -412,7 +412,7 @@ const state = shallowReactive({
   teams: [],
   query: '',
   activeFolder: '',
-  activeTab: active || 'local',
+  activeTab: routeActive || 'local',
   teamId: validTeamId ? teamId : '',
   perPage: savedSorts.perPage || 18,
   sortBy: savedSorts.sortBy || 'createdAt',
@@ -451,10 +451,28 @@ function startRecordWorkflow() {
     router.push('/recording');
   });
 }
-function updateActiveTab(data = {}) {
-  if (data.activeTab !== 'team') data.teamId = '';
+async function updateActiveTab(data = {}) {
+  if (data.activeTab !== 'team') {
+    data.teamId = '';
+  }
+
+  const query = {
+    ...router.currentRoute.value.query,
+    active: data.activeTab,
+  };
+
+  if (data.teamId) {
+    query.teamId = data.teamId;
+  } else {
+    delete query.teamId;
+  }
 
-  Object.assign(state, data);
+  await router.replace({
+    ...router.currentRoute.value,
+    query,
+  });
+
+  Object.assign(state, { ...data });
 }
 function addWorkflow() {
   workflowStore
@@ -531,6 +549,8 @@ function addHostedWorkflow() {
         const triggerBlock = findTriggerBlock(result.drawflow);
         await registerWorkflowTrigger(hostId, triggerBlock);
 
+        toast.success(t('workflow.host.messages.successAdded', { id: hostId }));
+
         return true;
       } catch (error) {
         console.error(error);
@@ -576,14 +596,23 @@ watch(
   }
 );
 watch(
-  () => [state.activeTab, state.teamId],
-  ([activeTab, teamIdQuery]) => {
-    const query = { active: activeTab };
+  () => router.currentRoute.value.query,
+  (query) => {
+    const newState = {};
 
-    if (teamIdQuery) query.teamId = teamIdQuery;
+    if (query.active && query.active !== state.activeTab) {
+      newState.activeTab = query.active;
+    }
 
-    router.replace({ ...router.currentRoute.value, query });
-  }
+    if (query.teamId !== undefined) {
+      newState.teamId = query.teamId || '';
+    }
+
+    if (Object.keys(newState).length > 0) {
+      Object.assign(state, newState);
+    }
+  },
+  { immediate: true }
 );
 
 onMounted(() => {
diff --git a/src/utils/workflowTrigger.js b/src/utils/workflowTrigger.js
index f3a2ad25f..fabb91513 100644
--- a/src/utils/workflowTrigger.js
+++ b/src/utils/workflowTrigger.js
@@ -107,7 +107,7 @@ export async function cleanWorkflowTriggers(workflowId, triggers) {
     const startupTriggers = (onStartupTriggers || []).filter(
       (id) => !id.includes(workflowId)
     );
-    const filteredVisitWebTriggers = visitWebTriggers?.filter(
+    const filteredVisitWebTriggers = (visitWebTriggers || []).filter(
       (item) => !item.id.includes(workflowId)
     );
 
diff --git a/src/workflowEngine/WorkflowWorker.js b/src/workflowEngine/WorkflowWorker.js
index bfc699b1c..df61ece8d 100644
--- a/src/workflowEngine/WorkflowWorker.js
+++ b/src/workflowEngine/WorkflowWorker.js
@@ -429,7 +429,8 @@ class WorkflowWorker {
 
       const { onError } = this.settings;
       const nodeConnections = this.getBlockConnections(block.id);
-
+      this.engine.restartWorkersCount = this.engine.restartWorkersCount || {};
+      
       if (onError === 'keep-running' && nodeConnections) {
         setTimeout(() => {
           executeBlocks(nodeConnections, error.data || '');