diff --git a/n8n-workflow.json b/n8n-workflow.json
index 47fd4ad..b6250a2 100644
--- a/n8n-workflow.json
+++ b/n8n-workflow.json
@@ -2895,7 +2895,7 @@
     },
     {
       "parameters": {
-        "jsCode": "// Build Paginated Container List Keyboard for callback pagination\nconst containers = $input.all().map(item => item.json);\nconst prevData = $(\"Prepare List Fetch\").item.json;\nconst chatId = prevData.chatId;\nconst messageId = prevData.messageId;\nconst page = prevData.page || 0;\n\n// Function to normalize container names\nfunction normalizeName(name) {\n  return name\n    .replace(/^\\//, \"\")\n    .replace(/^(linuxserver[-_]|binhex[-_])/i, \"\")\n    .toLowerCase();\n}\n\nconst containersPerPage = 6;\n\n// Group by state (running first)\nconst running = containers.filter(c => c.State === \"running\");\nconst stopped = containers.filter(c => c.State !== \"running\");\nconst sortedContainers = [...running, ...stopped];\n\nconst totalPages = Math.ceil(sortedContainers.length / containersPerPage);\nconst start = page * containersPerPage;\nconst pageContainers = sortedContainers.slice(start, start + containersPerPage);\n\n// Build keyboard rows\nconst keyboard = [];\n\npageContainers.forEach(container => {\n  const name = normalizeName(container.Names[0]);\n  const stateIcon = container.State === \"running\" ? \"\\u{1F7E2}\" : \"\\u26AA\";\n  const stateText = container.State === \"running\" ? \"Running\" : \"Stopped\";\n  keyboard.push([{\n    text: `${stateIcon} ${name} - ${stateText}`,\n    callback_data: `select:${name}`\n  }]);\n});\n\n// Add navigation row if needed\nif (totalPages > 1) {\n  const navRow = [];\n  if (page > 0) {\n    navRow.push({ text: \"\\u25C0\\uFE0F Previous\", callback_data: `list:${page - 1}` });\n  }\n  navRow.push({ text: `${page + 1}/${totalPages}`, callback_data: \"noop\" });\n  if (page < totalPages - 1) {\n    navRow.push({ text: \"Next \\u25B6\\uFE0F\", callback_data: `list:${page + 1}` });\n  }\n  keyboard.push(navRow);\n}\n\n// Add Select Multiple button for batch operations\nkeyboard.push([{ text: \"\u2611\ufe0f Select Multiple\", callback_data: \"batch:mode\" }]);\n\n// Build header text\nconst runningCount = running.length;\nconst totalCount = sortedContainers.length;\nlet headerText = `<b>\\u{1F5C2} Containers</b> (${runningCount}/${totalCount} running)`;\nif (totalPages > 1) {\n  headerText += `\\n\\nPage ${page + 1} of ${totalPages}`;\n}\nheaderText += \"\\n\\nTap a container to manage it:\";\n\nreturn [{\n  json: {\n    chatId,\n    messageId,\n    text: headerText,\n    reply_markup: { inline_keyboard: keyboard }\n  }\n}];"
+        "jsCode": "// Build Paginated Container List Keyboard for callback pagination\nconst containers = $input.all().map(item => item.json);\n// Try to get data from Prepare List Fetch, fallback to Prepare Batch Cancel Return\nlet prevData;\ntry {\n  prevData = $(\"Prepare List Fetch\").item.json;\n} catch (e) {\n  try {\n    prevData = $(\"Prepare Batch Cancel Return\").item.json;\n  } catch (e2) {\n    prevData = $json; // Fallback to current item\n  }\n}\nconst chatId = prevData.chatId;\nconst messageId = prevData.messageId;\nconst page = prevData.page || 0;\n\n// Function to normalize container names\nfunction normalizeName(name) {\n  return name\n    .replace(/^\\//, \"\")\n    .replace(/^(linuxserver[-_]|binhex[-_])/i, \"\")\n    .toLowerCase();\n}\n\nconst containersPerPage = 6;\n\n// Group by state (running first)\nconst running = containers.filter(c => c.State === \"running\");\nconst stopped = containers.filter(c => c.State !== \"running\");\nconst sortedContainers = [...running, ...stopped];\n\nconst totalPages = Math.ceil(sortedContainers.length / containersPerPage);\nconst start = page * containersPerPage;\nconst pageContainers = sortedContainers.slice(start, start + containersPerPage);\n\n// Build keyboard rows\nconst keyboard = [];\n\npageContainers.forEach(container => {\n  const name = normalizeName(container.Names[0]);\n  const stateIcon = container.State === \"running\" ? \"\\u{1F7E2}\" : \"\\u26AA\";\n  const stateText = container.State === \"running\" ? \"Running\" : \"Stopped\";\n  keyboard.push([{\n    text: `${stateIcon} ${name} - ${stateText}`,\n    callback_data: `select:${name}`\n  }]);\n});\n\n// Add navigation row if needed\nif (totalPages > 1) {\n  const navRow = [];\n  if (page > 0) {\n    navRow.push({ text: \"\\u25C0\\uFE0F Previous\", callback_data: `list:${page - 1}` });\n  }\n  navRow.push({ text: `${page + 1}/${totalPages}`, callback_data: \"noop\" });\n  if (page < totalPages - 1) {\n    navRow.push({ text: \"Next \\u25B6\\uFE0F\", callback_data: `list:${page + 1}` });\n  }\n  keyboard.push(navRow);\n}\n\n// Add Select Multiple button for batch operations\nkeyboard.push([{ text: \"\u2611\ufe0f Select Multiple\", callback_data: \"batch:mode\" }]);\n\n// Build header text\nconst runningCount = running.length;\nconst totalCount = sortedContainers.length;\nlet headerText = `<b>\\u{1F5C2} Containers</b> (${runningCount}/${totalCount} running)`;\nif (totalPages > 1) {\n  headerText += `\\n\\nPage ${page + 1} of ${totalPages}`;\n}\nheaderText += \"\\n\\nTap a container to manage it:\";\n\nreturn [{\n  json: {\n    chatId,\n    messageId,\n    text: headerText,\n    reply_markup: { inline_keyboard: keyboard }\n  }\n}];"
       },
       "id": "code-build-paginated-list",
       "name": "Build Paginated List",
@@ -5755,25 +5755,16 @@
     },
     {
       "parameters": {
-        "resource": "message",
-        "operation": "deleteMessage",
-        "chatId": "={{ $json.chatId }}",
-        "messageId": "={{ $json.messageId }}"
+        "jsCode": "// Prepare data to return to container list\nconst data = $(\"Parse Callback Data\").item.json;\nreturn {\n  json: {\n    queryId: data.queryId,\n    chatId: data.chatId,\n    messageId: data.messageId,\n    page: 0\n  }\n};"
       },
-      "id": "telegram-delete-batch-cancel-message",
-      "name": "Delete Batch Cancel Message",
-      "type": "n8n-nodes-base.telegram",
-      "typeVersion": 1.2,
+      "id": "code-prepare-batch-cancel-return",
+      "name": "Prepare Batch Cancel Return",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
       "position": [
         2200,
         5000
-      ],
-      "credentials": {
-        "telegramApi": {
-          "id": "I0xTTiASl7C1NZhJ",
-          "name": "Telegram account"
-        }
-      }
+      ]
     }
   ],
   "connections": {
@@ -8403,7 +8394,18 @@
       "main": [
         [
           {
-            "node": "Delete Batch Cancel Message",
+            "node": "Prepare Batch Cancel Return",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Prepare Batch Cancel Return": {
+      "main": [
+        [
+          {
+            "node": "Get Containers For List",
             "type": "main",
             "index": 0
           }