diff --git a/packages/v3-watcher/.gitignore b/packages/v3-watcher/.gitignore
index 0b4cc3f..549d70b 100644
--- a/packages/v3-watcher/.gitignore
+++ b/packages/v3-watcher/.gitignore
@@ -4,3 +4,5 @@ out/
 
 .vscode
 .idea
+
+gql-logs/
diff --git a/packages/v3-watcher/README.md b/packages/v3-watcher/README.md
index 6a71b43..9f74a88 100644
--- a/packages/v3-watcher/README.md
+++ b/packages/v3-watcher/README.md
@@ -2,7 +2,7 @@
 
 ## Source
 
-* Subgraph: sushiswap-subgraphs [v0.1.1-watcher-0.1.0](https://github.com/cerc-io/sushiswap-subgraphs/releases/tag/v0.1.1-watcher-0.1.0)
+* Subgraph: [sushiswap-subgraphs v0.1.1-watcher-0.1.0](https://github.com/cerc-io/sushiswap-subgraphs/releases/tag/v0.1.1-watcher-0.1.0)
 
 ## Setup
 
diff --git a/packages/v3-watcher/environments/local.toml b/packages/v3-watcher/environments/local.toml
index bab02fc..138f854 100644
--- a/packages/v3-watcher/environments/local.toml
+++ b/packages/v3-watcher/environments/local.toml
@@ -70,10 +70,10 @@
     ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
-    rpcClient = true
+    rpcClient = false
 
     # Boolean flag to specify if rpcProviderEndpoint is an FEVM RPC endpoint
-    isFEVM = true
+    isFEVM = false
 
     # Boolean flag to filter event logs by contracts
     filterLogsByAddresses = true
@@ -93,6 +93,9 @@
   subgraphEventsOrder = true
   blockDelayInMilliSecs = 2000
 
+  # Number of blocks by which block processing lags behind head
+  blockProcessingOffset = 16
+
   # Boolean to switch between modes of processing events when starting the server.
   # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them.
   # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head).
diff --git a/packages/v3-watcher/package.json b/packages/v3-watcher/package.json
index fd464b1..18dda85 100644
--- a/packages/v3-watcher/package.json
+++ b/packages/v3-watcher/package.json
@@ -29,7 +29,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/cerc-io/watcher-ts.git"
+    "url": "https://github.com/cerc-io/watcher-ts.git"
   },
   "author": "",
   "license": "AGPL-3.0",
@@ -39,11 +39,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.94",
-    "@cerc-io/ipld-eth-client": "^0.2.94",
-    "@cerc-io/solidity-mapper": "^0.2.94",
-    "@cerc-io/util": "^0.2.94",
-    "@cerc-io/graph-node": "^0.2.94",
+    "@cerc-io/cli": "^0.2.97",
+    "@cerc-io/ipld-eth-client": "^0.2.97",
+    "@cerc-io/solidity-mapper": "^0.2.97",
+    "@cerc-io/util": "^0.2.97",
+    "@cerc-io/graph-node": "^0.2.97",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",
diff --git a/packages/v3-watcher/src/resolvers.ts b/packages/v3-watcher/src/resolvers.ts
index 0b13ec1..5af43d8 100644
--- a/packages/v3-watcher/src/resolvers.ts
+++ b/packages/v3-watcher/src/resolvers.ts
@@ -89,6 +89,8 @@ const executeAndRecordMetrics = async (
       apiKey: expressContext.req.header('x-api-key'),
       origin: expressContext.req.headers.origin
     });
+
+    throw error;
   } finally {
     endTimer();
   }
diff --git a/packages/v3-watcher/subgraph-build/Factory/Factory.wasm b/packages/v3-watcher/subgraph-build/Factory/Factory.wasm
index 8804941..ae80ef1 100644
Binary files a/packages/v3-watcher/subgraph-build/Factory/Factory.wasm and b/packages/v3-watcher/subgraph-build/Factory/Factory.wasm differ
diff --git a/packages/v3-watcher/subgraph-build/NonfungiblePositionManager/NonfungiblePositionManager.wasm b/packages/v3-watcher/subgraph-build/NonfungiblePositionManager/NonfungiblePositionManager.wasm
index 030c107..47d8567 100644
Binary files a/packages/v3-watcher/subgraph-build/NonfungiblePositionManager/NonfungiblePositionManager.wasm and b/packages/v3-watcher/subgraph-build/NonfungiblePositionManager/NonfungiblePositionManager.wasm differ
diff --git a/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm b/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm
index 46a279c..9687a2e 100644
Binary files a/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm and b/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm differ