diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
index 8b99204..dc6ce64 100644
--- a/.github/workflows/test-workflow.yml
+++ b/.github/workflows/test-workflow.yml
@@ -1,5 +1,8 @@
 name: test
 on:
+  push:
+    branches:
+      - main
   pull_request:
     paths:
       - '**.js'
diff --git a/src/server/tools/emissions/__tests__/emissions-by-id.spec.ts b/src/server/tools/emissions/__tests__/emissions-by-id.spec.ts
index db59288..07ed103 100644
--- a/src/server/tools/emissions/__tests__/emissions-by-id.spec.ts
+++ b/src/server/tools/emissions/__tests__/emissions-by-id.spec.ts
@@ -64,6 +64,7 @@ describe('registerEmissionsById', () => {
     expect(FetchAndProcessUtil.getItem).toHaveBeenCalledWith({
       itemName: 'emissions',
       query: emissionsQuery,
+      operationType: 'query',
       variables: {
         routeId: 'route123',
         routeDetailsId: 'details456',
@@ -87,6 +88,7 @@ describe('registerEmissionsById', () => {
     expect(FetchAndProcessUtil.getItem).toHaveBeenCalledWith({
       itemName: 'emissions',
       query: emissionsQuery,
+      operationType: 'query',
       variables: {
         routeId: 'route789',
         routeDetailsId: 'details101',
diff --git a/src/server/tools/emissions/emissions-by-id.ts b/src/server/tools/emissions/emissions-by-id.ts
index 2fc4331..5c14a80 100644
--- a/src/server/tools/emissions/emissions-by-id.ts
+++ b/src/server/tools/emissions/emissions-by-id.ts
@@ -43,6 +43,7 @@ export function registerEmissionsById(server: McpServer): void {
         itemName: 'emissions',
         query: emissionsQuery,
         variables,
+        operationType: 'query',
         mapFunction: emissions =>
           MappingEmissionsUtil.mapEmissions({
             routeId: input.routeId,
diff --git a/test/wiremock/mappings/create-route.json b/test/wiremock/mappings/create-route.json
index a509086..0925830 100644
--- a/test/wiremock/mappings/create-route.json
+++ b/test/wiremock/mappings/create-route.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "createRoute(" }]
+    "bodyPatterns": [{ "contains": "item: createRoute(" }]
   },
   "response": {
     "status": 200,
diff --git a/test/wiremock/mappings/emissions-by-id.json b/test/wiremock/mappings/emissions-by-id.json
index d9245f5..aaf4fc9 100644
--- a/test/wiremock/mappings/emissions-by-id.json
+++ b/test/wiremock/mappings/emissions-by-id.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "getRouteEmissions(" }]
+    "bodyPatterns": [{ "contains": "item: getRouteEmissions(" }]
   },
   "response": {
     "status": 200,
diff --git a/test/wiremock/mappings/operator-by-id.json b/test/wiremock/mappings/operator-by-id.json
index fd9546e..56cb370 100644
--- a/test/wiremock/mappings/operator-by-id.json
+++ b/test/wiremock/mappings/operator-by-id.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "operator(" }]
+    "bodyPatterns": [{ "contains": "item: operator(" }]
   },
   "response": {
     "status": 200,
diff --git a/test/wiremock/mappings/operator-list.json b/test/wiremock/mappings/operator-list.json
index ecf33b9..0567a38 100644
--- a/test/wiremock/mappings/operator-list.json
+++ b/test/wiremock/mappings/operator-list.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "operatorList(" }]
+    "bodyPatterns": [{ "contains": "list: operatorList(" }]
   },
   "response": {
     "status": 200,
diff --git a/test/wiremock/mappings/route-by-id.json b/test/wiremock/mappings/route-by-id.json
index 6ee6208..219cb3b 100644
--- a/test/wiremock/mappings/route-by-id.json
+++ b/test/wiremock/mappings/route-by-id.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "getRoute(" }]
+    "bodyPatterns": [{ "contains": "item: getRoute(" }]
   },
   "response": {
     "status": 200,
diff --git a/test/wiremock/mappings/station-around.json b/test/wiremock/mappings/station-around.json
index c32c4fe..90c6a0c 100644
--- a/test/wiremock/mappings/station-around.json
+++ b/test/wiremock/mappings/station-around.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "stationAround(" }]
+    "bodyPatterns": [{ "contains": "list: stationAround(" }]
   },
   "response": {
     "status": 200,
diff --git a/test/wiremock/mappings/station-by-id.json b/test/wiremock/mappings/station-by-id.json
index 26f5f29..5269165 100644
--- a/test/wiremock/mappings/station-by-id.json
+++ b/test/wiremock/mappings/station-by-id.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "station(" }]
+    "bodyPatterns": [{ "contains": "item: station(" }]
   },
   "response": {
     "status": 200,
diff --git a/test/wiremock/mappings/station-list.json b/test/wiremock/mappings/station-list.json
index 6f21b6b..4c8fda0 100644
--- a/test/wiremock/mappings/station-list.json
+++ b/test/wiremock/mappings/station-list.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "stationList(" }]
+    "bodyPatterns": [{ "contains": "list: stationList(" }]
   },
   "response": {
     "status": 200,
diff --git a/test/wiremock/mappings/vehicle-by-id.json b/test/wiremock/mappings/vehicle-by-id.json
index 8369839..8c3d2f1 100644
--- a/test/wiremock/mappings/vehicle-by-id.json
+++ b/test/wiremock/mappings/vehicle-by-id.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "vehicle(" }]
+    "bodyPatterns": [{ "contains": "item: vehicle(" }]
   },
   "response": {
     "status": 200,
diff --git a/test/wiremock/mappings/vehicle-list.json b/test/wiremock/mappings/vehicle-list.json
index a9aea71..02d5907 100644
--- a/test/wiremock/mappings/vehicle-list.json
+++ b/test/wiremock/mappings/vehicle-list.json
@@ -2,7 +2,7 @@
   "request": {
     "method": "POST",
     "url": "/graphql",
-    "bodyPatterns": [{ "contains": "vehicleList(" }]
+    "bodyPatterns": [{ "contains": "list: vehicleList(" }]
   },
   "response": {
     "status": 200,