diff --git a/bin/stacks/routing-caching-stack.ts b/bin/stacks/routing-caching-stack.ts
index ae7dfa16e5..63339eb0bb 100644
--- a/bin/stacks/routing-caching-stack.ts
+++ b/bin/stacks/routing-caching-stack.ts
@@ -17,6 +17,7 @@ import * as path from 'path'
 import { chainProtocols } from '../../lib/cron/cache-config'
 import { STAGE } from '../../lib/util/stage'
 import { PoolCachingFilePrefixes } from '../../lib/util/poolCachingFilePrefixes'
+import { ChainId } from '@uniswap/sdk-core'
 
 export interface RoutingCachingStackProps extends cdk.NestedStackProps {
   stage: string
@@ -123,7 +124,7 @@ export class RoutingCachingStack extends cdk.NestedStack {
           entry: path.join(__dirname, '../../lib/cron/cache-pools.ts'),
           handler: 'handler',
           timeout: Duration.seconds(900),
-          memorySize: 2560,
+          memorySize: chainId === ChainId.BASE ? 5120 : 2560,
           bundling: {
             minify: true,
             sourceMap: true,
diff --git a/lib/cron/cache-pools.ts b/lib/cron/cache-pools.ts
index b6c5575184..ef66f8f219 100644
--- a/lib/cron/cache-pools.ts
+++ b/lib/cron/cache-pools.ts
@@ -238,10 +238,16 @@ const handler: ScheduledHandler = metricScope((metrics) => async (event: EventBr
           hooks: '0xc5a48b447f01e9ce3ede71e4c1c2038c38bd9000',
           liquidity: '274563705100803912362733',
           token0: {
+            symbol: 'fid:385955',
             id: '0x112cf1cc540eadf234158c0e4044c3b5f2a33e5e',
+            name: 'degenfans',
+            decimals: '18',
           },
           token1: {
+            symbol: 'MOXIE',
             id: '0x8c9037d1ef5c6d1f6816278c7aaf5491d24cd527',
+            name: 'Moxie',
+            decimals: '18',
           },
           tvlETH: 25.33120577965346308313185954009482,
           tvlUSD: 56627.5525783346590219799350683533,
@@ -253,10 +259,16 @@ const handler: ScheduledHandler = metricScope((metrics) => async (event: EventBr
           hooks: '0xc5a48b447f01e9ce3ede71e4c1c2038c38bd9000',
           liquidity: '621568112474979678301274',
           token0: {
+            symbol: 'base-economy',
             id: '0x125490489a27d541e39813c08d260debac071bb7',
+            name: 'Base Economy',
+            decimals: '18',
           },
           token1: {
+            symbol: 'MOXIE',
             id: '0x8c9037d1ef5c6d1f6816278c7aaf5491d24cd527',
+            name: 'Moxie',
+            decimals: '18',
           },
           tvlETH: 142.7576163222032969740638595951846,
           tvlUSD: 316322.6881520965844428159264274397,
@@ -268,10 +280,16 @@ const handler: ScheduledHandler = metricScope((metrics) => async (event: EventBr
           hooks: '0xc5a48b447f01e9ce3ede71e4c1c2038c38bd9000',
           liquidity: '482843960670027606548690',
           token0: {
+            symbol: 'fid:444067',
             id: '0x15148da22518e40e0d2fabf5d5e6a22269ebcb30',
+            name: 'macster',
+            decimals: '18',
           },
           token1: {
+            symbol: 'MOXIE',
             id: '0x8c9037d1ef5c6d1f6816278c7aaf5491d24cd527',
+            name: 'Moxie',
+            decimals: '18',
           },
           tvlETH: 44.1795925485023741879813651641809,
           tvlUSD: 95050.95363442908526427214106054717,
@@ -313,10 +331,10 @@ const handler: ScheduledHandler = metricScope((metrics) => async (event: EventBr
             hooks: bunniPool.hooks,
             liquidity: bunniPool.liquidity,
             token0: {
-              id: bunniPool.token0.id,
+              ...bunniPool.token0,
             },
             token1: {
-              id: bunniPool.token1.id,
+              ...bunniPool.token1,
             },
             tvlETH: bunniPool.tvlETH,
             tvlUSD: bunniPool.tvlUSD,
@@ -333,10 +351,16 @@ const handler: ScheduledHandler = metricScope((metrics) => async (event: EventBr
           hooks: '0x730b109bad65152c67ecc94eb8b0968603dba888',
           liquidity: '173747248900',
           token0: {
+            symbol: 'ETH',
             id: '0x0000000000000000000000000000000000000000',
+            name: 'Ethereum',
+            decimals: '18',
           },
           token1: {
+            symbol: 'WETH',
             id: '0x4200000000000000000000000000000000000006',
+            name: 'Wrapped Ether',
+            decimals: '18',
           },
           tvlETH: 33482,
           tvlUSD: 60342168,
@@ -352,10 +376,16 @@ const handler: ScheduledHandler = metricScope((metrics) => async (event: EventBr
           hooks: '0x480dafdb4d6092ef3217595b75784ec54b52e888',
           liquidity: '173747248900',
           token0: {
+            symbol: 'ETH',
             id: '0x0000000000000000000000000000000000000000',
+            name: 'Ethereum',
+            decimals: '18',
           },
           token1: {
+            symbol: 'WETH',
             id: '0x4200000000000000000000000000000000000006',
+            name: 'Wrapped Ether',
+            decimals: '18',
           },
           tvlETH: 826,
           tvlUSD: 1482475,
@@ -371,10 +401,16 @@ const handler: ScheduledHandler = metricScope((metrics) => async (event: EventBr
           hooks: '0xb08211d57032dd10b1974d4b876851a7f7596888',
           liquidity: '173747248900',
           token0: {
+            symbol: 'ETH',
             id: '0x0000000000000000000000000000000000000000',
+            name: 'Ethereum',
+            decimals: '18',
           },
           token1: {
+            symbol: 'WETH',
             id: '0x4200000000000000000000000000000000000006',
+            name: 'Wrapped Ether',
+            decimals: '18',
           },
           tvlETH: 6992,
           tvlUSD: 12580000,
diff --git a/lib/util/bunni-pools.ts b/lib/util/bunni-pools.ts
index c02180afb8..0f2ec11639 100644
--- a/lib/util/bunni-pools.ts
+++ b/lib/util/bunni-pools.ts
@@ -1,373 +1,500 @@
 import { ChainId } from '@uniswap/sdk-core'
+import { V4SubgraphPool } from '@uniswap/smart-order-router'
+
+export type BunniPool = V4SubgraphPool & {
+  chainId: ChainId
+  comment: string
+}
 
 // Bunni pools
-export const BUNNI_POOLS_CONFIG = [
+export const BUNNI_POOLS_CONFIG: BunniPool[] = [
   // Bunni USDC-USDT Unichain
   {
     id: '0xeec51c6b1a9e7c4bb4fc4fa9a02fc4fff3fe94efd044f895d98b5bfbd2ff9433',
     chainId: ChainId.UNICHAIN,
-    tvlUSD: 40340000,
-    tvlETH: 10821.51,
+    tvlUSD: 28813605,
+    tvlETH: 6278.38,
     comment: 'Bunni USDC-USDT Unichain',
     feeTier: '0',
     tickSpacing: '1',
     hooks: '0x005af73a245d8171a0550ffae2631f12cc211888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'USDC',
       id: '0x078d782b760474a361dda0af3839290b0ef57ad6',
+      name: 'USDC',
+      decimals: '6',
     },
     token1: {
+      symbol: 'USD₮0',
       id: '0x9151434b16b9763660705744891fa906f660ecc5',
+      name: 'USD₮0',
+      decimals: '6',
     },
   },
   // Bunni USDC-USDT Mainnet
   {
     id: '0xd9f673912e1da331c9e56c5f0dbc7273c0eb684617939a375ec5e227c62d6707',
     chainId: ChainId.MAINNET,
-    tvlUSD: 3470000,
-    tvlETH: 930.54,
+    tvlUSD: 23777373,
+    tvlETH: 5181,
     comment: 'Bunni USDC-USDT Mainnet',
     feeTier: '0',
     tickSpacing: '1',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'USDC',
       id: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+      name: 'USD Coin',
+      decimals: '6',
     },
     token1: {
+      symbol: 'USDT',
       id: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+      name: 'Tether USD',
+      decimals: '6',
     },
   },
   // Bunni ETH-weETH Unichain
   {
     id: '0x6923777072439713c7b8ab34903e0ea96078d7148449bf54f420320d59ede857',
     chainId: ChainId.UNICHAIN,
-    tvlUSD: 3320000,
-    tvlETH: 890.28,
+    tvlUSD: 13395486,
+    tvlETH: 2918.83,
     comment: 'Bunni ETH-weETH Unichain',
     feeTier: '0',
     tickSpacing: '1',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'weETH',
       id: '0x7dcc39b4d1c53cb31e1abc0e358b43987fef80f7',
+      name: 'Wrapped eETH',
+      decimals: '18',
     },
   },
   // USR-USDC Mainnet
   {
     id: '0x77f73405a72f844e46d26a0bfd6f145c1a45ffcf6e4af5c86811405f29d2e615',
     chainId: ChainId.MAINNET,
-    tvlUSD: 1550000,
-    tvlETH: 415.63,
+    tvlUSD: 1553028,
+    tvlETH: 338.4,
     comment: 'USR-USDC Mainnet',
     feeTier: '0',
     tickSpacing: '10',
     hooks: '0x0010d0d5db05933fa0d9f7038d365e1541a41888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'USR',
       id: '0x66a1e37c9b0eaddca17d3662d6c05f4decf3e110',
+      name: 'Resolv USD',
+      decimals: '18',
     },
     token1: {
+      symbol: 'USDC',
       id: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+      name: 'USD Coin',
+      decimals: '6',
     },
   },
   // USND-USDC Arbitrum
   {
     id: '0x75c55eda2c37c47eaf1db8b500171f72f23dc5b16404e904866a6ad1b3a3e537',
     chainId: ChainId.ARBITRUM_ONE,
-    tvlUSD: 895010,
-    tvlETH: 240.09,
+    tvlUSD: 208654,
+    tvlETH: 45.46,
     comment: 'USND-USDC Arbitrum',
     feeTier: '0',
     tickSpacing: '10',
     hooks: '0x0000eb22c45bdb564f985ace0b4d05a64fa71888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'USND',
       id: '0x4ecf61a6c2fab8a047ceb3b3b263b401763e9d49',
+      name: 'US Nerite Dollar',
+      decimals: '18',
     },
     token1: {
+      symbol: 'USDC',
       id: '0xaf88d065e77c8cc2239327c5edb3a432268e5831',
+      name: 'USD Coin',
+      decimals: '6',
     },
   },
   // ETH-BUNNI #1 Mainnet
   {
     id: '0x9148f00424c4b40a9ec4b03912f091138e9e91a60980550ed97ed7f9dc998cb5',
     chainId: ChainId.MAINNET,
-    tvlUSD: 842230,
-    tvlETH: 225.84,
+    tvlUSD: 729657,
+    tvlETH: 158.99,
     comment: 'ETH-BUNNI #1 Mainnet',
     feeTier: '1',
     tickSpacing: '60',
     hooks: '0x0010d0d5db05933fa0d9f7038d365e1541a41888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'BUNNI',
       id: '0x000000c396558ffbab5ea628f39658bdf61345b3',
+      name: 'Bunni',
+      decimals: '18',
     },
   },
   // USDC-USDT #1 Unichain
   {
     id: '0x38eeae8c6d1c205eff7c18ca631c9c65afa357e83fa130ec215aff81741d2408',
     chainId: ChainId.UNICHAIN,
-    tvlUSD: 225070,
-    tvlETH: 60.36,
+    tvlUSD: 30,
+    tvlETH: 0.01,
     comment: 'USDC-USDT #1 Unichain',
     feeTier: '0',
     tickSpacing: '10',
     hooks: '0x0000fe59823933ac763611a69c88f91d45f81888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'USDC',
       id: '0x078d782b760474a361dda0af3839290b0ef57ad6',
+      name: 'USDC',
+      decimals: '6',
     },
     token1: {
+      symbol: 'USDT',
       id: '0x588ce4f028d8e7b53b687865d6a67b3a54c75518',
+      name: 'Tether USD',
+      decimals: '6',
     },
   },
   // USDT-USDf #55 Mainnet
   {
     id: '0x68306351b1155f7329bc4428657aa73b8a32e87e916f897b7dcb1328f2ec60a3',
     chainId: ChainId.MAINNET,
-    tvlUSD: 166960,
-    tvlETH: 44.77,
+    tvlUSD: 3548170,
+    tvlETH: 773.13,
     comment: 'USDT-USDf #55 Mainnet',
     feeTier: '0',
     tickSpacing: '10',
     hooks: '0x0000fe59823933ac763611a69c88f91d45f81888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'USDT',
       id: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+      name: 'Tether USD',
+      decimals: '6',
     },
     token1: {
+      symbol: 'USDf',
       id: '0xfa2b947eec368f42195f24f36d2af29f7c24cec2',
+      name: 'Falcon USD',
+      decimals: '18',
     },
   },
   // ETH-MET #83 Mainnet
   {
     id: '0xa27d94eb334faeb7e65b2b861d4ea4dc3ddce9bdea10bff37fac9f9f095d2148',
     chainId: ChainId.MAINNET,
-    tvlUSD: 125580,
-    tvlETH: 33.68,
+    tvlUSD: 169447,
+    tvlETH: 36.92,
     comment: 'ETH-MET #83 Mainnet',
     feeTier: '0',
     tickSpacing: '100',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'MET',
       id: '0x2ebd53d035150f328bd754d6dc66b99b0edb89aa',
+      name: 'MET',
+      decimals: '18',
     },
   },
   // Bunni USD0-USD0++ Mainnet
   {
     id: '0x54ff1fd1d62f3bc6224082ecfdb3190a34e8428611b058ade19ce6c083cb608b',
     chainId: ChainId.MAINNET,
-    tvlUSD: 64330,
-    tvlETH: 17.26,
+    tvlUSD: 101866,
+    tvlETH: 22.2,
     comment: 'Bunni USD0-USD0++ Mainnet',
     feeTier: '0',
     tickSpacing: '5',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'USD0++',
       id: '0x35d8949372d46b7a3d5a56006ae77b215fc69bc0',
+      name: 'USD0 Liquid Bond',
+      decimals: '18',
     },
     token1: {
+      symbol: 'USD0',
       id: '0x73a15fed60bf67631dc6cd7bc5b6e8da8190acf5',
+      name: 'Usual USD',
+      decimals: '18',
     },
   },
   // ETH-USDC #289 Base
   {
     id: '0xbb10cb59b736ab186d8a17d8459bf93503cf820f701884e0154c429057bd7227',
     chainId: ChainId.BASE,
-    tvlUSD: 54780,
-    tvlETH: 14.69,
+    tvlUSD: 0,
+    tvlETH: 0,
     comment: 'ETH-USDC #289 Base',
     feeTier: '0',
     tickSpacing: '5',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      name: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      symbol: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      name: 'USDC',
       id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+      symbol: 'USD Coin',
+      decimals: '6',
     },
   },
   // hwHLP-USDT #95 Mainnet
   {
     id: '0x896895226e2cde763d53496363ef5af1d6d60f0df7960d658c1d0c6251db6c66',
     chainId: ChainId.MAINNET,
-    tvlUSD: 49540,
-    tvlETH: 13.29,
+    tvlUSD: 252320,
+    tvlETH: 54.98,
     comment: 'hwHLP-USDT #95 Mainnet',
     feeTier: '0',
     tickSpacing: '10',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'hwHLP',
       id: '0x9fd7466f987fd4c45a5bbde22ed8aba5bc8d72d1',
+      name: 'hwHLP',
+      decimals: '6',
     },
     token1: {
+      symbol: 'USDT',
       id: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+      name: 'Tether USD',
+      decimals: '6',
     },
   },
   // ETH-PRL #80 Mainnet
   {
     id: '0xbc472c63afae4d891699e56a0e1ce6b4c7b71a1830494c214a739de06c49384f',
     chainId: ChainId.MAINNET,
-    tvlUSD: 42060,
-    tvlETH: 11.28,
+    tvlUSD: 52137,
+    tvlETH: 11.36,
     comment: 'ETH-PRL #80 Mainnet',
     feeTier: '2',
     tickSpacing: '100',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'PRL',
       id: '0x6c0aeceedc55c9d55d8b99216a670d85330941c3',
+      name: 'Parallel Governance Token',
+      decimals: '18',
     },
   },
   // ETH-USDC #293 Base
   {
     id: '0x6dbb5d653f8e11f406adf38091138546f70bc352ccf1115983520d1fe4284449',
     chainId: ChainId.BASE,
-    tvlUSD: 36290,
-    tvlETH: 9.73,
+    tvlUSD: 0,
+    tvlETH: 0,
     comment: 'ETH-USDC #293 Base',
     feeTier: '1',
     tickSpacing: '5',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'USDC',
       id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+      name: 'USD Coin',
+      decimals: '6',
     },
   },
   // ETH-BUNNI #26 Base
   {
     id: '0xc3011ab27d607decdc04ab317585dececaa91de749be8b46accb36e066d8f420',
     chainId: ChainId.BASE,
-    tvlUSD: 35070,
-    tvlETH: 9.4,
+    tvlUSD: 32813,
+    tvlETH: 7.15,
     comment: 'ETH-BUNNI #26 Base',
     feeTier: '0',
     tickSpacing: '60',
     hooks: '0x0010d0d5db05933fa0d9f7038d365e1541a41888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'BUNNI',
       id: '0x000000c396558ffbab5ea628f39658bdf61345b3',
+      name: 'Bunni',
+      decimals: '18',
     },
   },
   // ETH-USDC #62 Unichain
   {
     id: '0x39bd03115d5482eefbf43b1f3f3c48188f32bcb09b43fd4722f4c86d399e282a',
     chainId: ChainId.UNICHAIN,
-    tvlUSD: 34950,
-    tvlETH: 9.37,
+    tvlUSD: 106,
+    tvlETH: 0.02,
     comment: 'ETH-USDC #62 Unichain',
     feeTier: '0',
     tickSpacing: '5',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'USDC',
       id: '0x078d782b760474a361dda0af3839290b0ef57ad6',
+      name: 'USDC',
+      decimals: '6',
     },
   },
   // ETH-BUNNI #12 Arbitrum
   {
     id: '0xc3011ab27d607decdc04ab317585dececaa91de749be8b46accb36e066d8f420',
     chainId: ChainId.ARBITRUM_ONE,
-    tvlUSD: 30760,
-    tvlETH: 8.25,
+    tvlUSD: 30061,
+    tvlETH: 6.55,
     comment: 'ETH-BUNNI #12 Arbitrum',
     feeTier: '0',
     tickSpacing: '60',
     hooks: '0x0010d0d5db05933fa0d9f7038d365e1541a41888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'BUNNI',
       id: '0x000000c396558ffbab5ea628f39658bdf61345b3',
+      name: 'Bunni',
+      decimals: '18',
     },
   },
   // BUNNI-USDC #33 Mainnet
   {
     id: '0x00ef227c44fdb9dead9e5249abacfd8236ff375e84f6578e4c64743643a90447',
     chainId: ChainId.MAINNET,
-    tvlUSD: 22940,
-    tvlETH: 6.15,
+    tvlUSD: 18205,
+    tvlETH: 3.97,
     comment: 'BUNNI-USDC #33 Mainnet',
     feeTier: '0',
     tickSpacing: '60',
     hooks: '0x0000fe59823933ac763611a69c88f91d45f81888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'BUNNI',
       id: '0x000000c396558ffbab5ea628f39658bdf61345b3',
+      name: 'Bunni',
+      decimals: '18',
     },
     token1: {
+      symbol: 'USDC',
       id: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+      name: 'USD Coin',
+      decimals: '6',
     },
   },
   // ETH-USDC #272 Base
   {
     id: '0x153695fdc96c0a3152b166ed2183c61268bb94e81aa21f1fde4304e277c49755',
     chainId: ChainId.BASE,
-    tvlUSD: 19060,
-    tvlETH: 5.11,
+    tvlUSD: 16816,
+    tvlETH: 3.66,
     comment: 'ETH-USDC #272 Base',
     feeTier: '1',
     tickSpacing: '10',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'USDC',
       id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+      name: 'USD Coin',
+      decimals: '6',
     },
   },
   // ETH-USDC #294 Base
   {
     id: '0xdea704e5d90cec9defc31ce88a1d06033fd7a02297fd5852ac103027e30134cb',
     chainId: ChainId.BASE,
-    tvlUSD: 16510,
-    tvlETH: 4.43,
+    tvlUSD: 22654,
+    tvlETH: 4.94,
     comment: 'ETH-USDC #294 Base',
     feeTier: '2',
     tickSpacing: '5',
     hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
     liquidity: '173747248900',
     token0: {
+      symbol: 'ETH',
       id: '0x0000000000000000000000000000000000000000',
+      name: 'Ethereum',
+      decimals: '18',
     },
     token1: {
+      symbol: 'USDC',
       id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+      name: 'USD Coin',
+      decimals: '6',
     },
   },
+  /* TODO: add back those bunni pool later, once we fix the dyanmic fee hook cached routes as well as cross liquidity for zora tokens
   // ETH-USDC #237 Base
   {
     id: '0x471931205b39f65dcf1c063761c098f7b29237af4059533e246a3545929156ed',
     chainId: ChainId.BASE,
-    tvlUSD: 14910,
-    tvlETH: 3.998,
+    tvlUSD: 14845,
+    tvlETH: 3.23,
     comment: 'ETH-USDC #237 Base',
     feeTier: '11',
     tickSpacing: '100',
@@ -384,8 +511,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x60a57df13fb84af43e06a2ed44a8800e6e693e0ef9a648cac5755feb58cab1ec',
     chainId: ChainId.MAINNET,
-    tvlUSD: 13020,
-    tvlETH: 3.49,
+    tvlUSD: 0,
+    tvlETH: 0,
     comment: 'ETH-USDC #93 Mainnet',
     feeTier: '0',
     tickSpacing: '20',
@@ -402,8 +529,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xec8d8d7c033f92492ab5c18272bae93324d12a5c452db1e2da0c63deb9e24dcd',
     chainId: ChainId.BASE,
-    tvlUSD: 11620,
-    tvlETH: 3.116,
+    tvlUSD: 157.9,
+    tvlETH: 0.034,
     comment: 'ETH-DOT #238 Base',
     feeTier: '0',
     tickSpacing: '60',
@@ -420,8 +547,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xe7154d81104dc9ff8aec461c020a8cdb2cbbb0bfb910454ee020e5f43748ca6f',
     chainId: ChainId.UNICHAIN,
-    tvlUSD: 11520,
-    tvlETH: 3.09,
+    tvlUSD: 0,
+    tvlETH: 0,
     comment: 'ETH-USDC #63 Unichain',
     feeTier: '1',
     tickSpacing: '5',
@@ -438,8 +565,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xe0326777ba1df8f4b5c522b58a669910e78efb1aa5596741dc224b4ac4ac1105',
     chainId: ChainId.UNICHAIN,
-    tvlUSD: 10780,
-    tvlETH: 2.89,
+    tvlUSD: 289,
+    tvlETH: 0.06,
     comment: 'ETH-USDC #52 Unichain',
     feeTier: '1',
     tickSpacing: '15',
@@ -456,8 +583,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xec8d8d7c033f92492ab5c18272bae93324d12a5c452db1e2da0c63deb9e24dcd',
     chainId: ChainId.MAINNET,
-    tvlUSD: 10610,
-    tvlETH: 2.845,
+    tvlUSD: 85,
+    tvlETH: 0.0185,
     comment: 'ETH-DOT #82 Mainnet',
     feeTier: '0',
     tickSpacing: '60',
@@ -474,8 +601,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xc50a93437d1519f973138b2969583871bea0a6a9840d192c612d3cdd767fa70c',
     chainId: ChainId.MAINNET,
-    tvlUSD: 10310,
-    tvlETH: 2.76,
+    tvlUSD: 0,
+    tvlETH: 0,
     comment: 'ETH-USDC #97 Mainnet',
     feeTier: '0',
     tickSpacing: '5',
@@ -492,8 +619,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x5195b3bf1daf25337b0db638c9c7dee112c9e4ddad39e9d7a1e706ba36183e73',
     chainId: ChainId.MAINNET,
-    tvlUSD: 10070,
-    tvlETH: 2.7,
+    tvlUSD: 10108,
+    tvlETH: 2.2,
     comment: 'USDC-USN #81 Mainnet',
     feeTier: '0',
     tickSpacing: '10',
@@ -510,8 +637,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xe321dcdee0324032c55436c4ca2a41719c9e3bed1ac3e06e64a52952a73f41bd',
     chainId: ChainId.BASE,
-    tvlUSD: 9770,
-    tvlETH: 2.62,
+    tvlUSD: 0,
+    tvlETH: 0,
     comment: 'ETH-USDC #247 Base',
     feeTier: '4',
     tickSpacing: '60',
@@ -528,8 +655,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xa9f6c9c09120188ce8ec833bbe87b702a5b61996e970138040acf8066334bc19',
     chainId: ChainId.BASE,
-    tvlUSD: 6820,
-    tvlETH: 1.83,
+    tvlUSD: 8590,
+    tvlETH: 1.87,
     comment: 'ETH-BETS #43 Base',
     feeTier: '0',
     tickSpacing: '100',
@@ -546,8 +673,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x8603a8a4283333cd5d12e657e77394f27c1c877b32ee00f644d7d6e76d229a6e',
     chainId: ChainId.BASE,
-    tvlUSD: 6140,
-    tvlETH: 1.65,
+    tvlUSD: 0,
+    tvlETH: 0,
     comment: 'ETH-USDC #287 Base',
     feeTier: '0',
     tickSpacing: '40',
@@ -564,8 +691,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x1462eda3ab4d44cd593c3e22e323bbf7058dabdc84a8d6cc8bdfb2428bd77547',
     chainId: ChainId.ARBITRUM_ONE,
-    tvlUSD: 6090,
-    tvlETH: 1.633,
+    tvlUSD: 127,
+    tvlETH: 0.027,
     comment: 'ETH-DOT #42 Arbitrum',
     feeTier: '0',
     tickSpacing: '60',
@@ -582,8 +709,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x48323603dde908bfbd512c4c723e28ea9c7ee7f5558f7bcc9cafa798c039b9bd',
     chainId: ChainId.BNB,
-    tvlUSD: 5220,
-    tvlETH: 1.4,
+    tvlUSD: 3,
+    tvlETH: 0.0006,
     comment: 'WETH-DOT #5 BSC',
     feeTier: '0',
     tickSpacing: '60',
@@ -600,8 +727,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xa7654bd36dd1ea5da2a6a93adc36a6ddf1b0430039ed10ec655a5ab06fc0d2a3',
     chainId: ChainId.BASE,
-    tvlUSD: 5220,
-    tvlETH: 1.4,
+    tvlUSD: 6250,
+    tvlETH: 1.36,
     comment: 'ETH-weETH 1.0 Base',
     feeTier: '0',
     tickSpacing: '10',
@@ -618,8 +745,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x18851334c1315b5c92d577e50f3190e599ab6f7460b7859add5473f922c3bf54',
     chainId: ChainId.BASE,
-    tvlUSD: 3720,
-    tvlETH: 0.998,
+    tvlUSD: 3748,
+    tvlETH: 0.82,
     comment: 'ETH-wstETH 1.0 Base',
     feeTier: '0',
     tickSpacing: '10',
@@ -636,8 +763,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x10489138471e08ab1b1be7c2130253b18f61a1bfad6ca827199296088c6e90d6',
     chainId: ChainId.UNICHAIN,
-    tvlUSD: 3100,
-    tvlETH: 0.831,
+    tvlUSD: 3850,
+    tvlETH: 0.84,
     comment: 'Bunni ETH-ezETH Unichain',
     feeTier: '0',
     tickSpacing: '10',
@@ -654,8 +781,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x00d3f91dafdb3ebcf6df83e44542cd2db299518d582efa1e4f6ff2fed2a28bff',
     chainId: ChainId.BASE,
-    tvlUSD: 2960,
-    tvlETH: 0.794,
+    tvlUSD: 1523,
+    tvlETH: 0.33,
     comment: 'ETH-USDC #250 Base',
     feeTier: '0',
     tickSpacing: '15',
@@ -672,8 +799,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x6fbd7ab3e52fea2a986a24990db57b8a5a90c8769bfd9cbc0c276541fcb73e53',
     chainId: ChainId.MAINNET,
-    tvlUSD: 2760,
-    tvlETH: 0.74,
+    tvlUSD: 1973,
+    tvlETH: 0.43,
     comment: 'ETH-BUNNI #2 Mainnet',
     feeTier: '0',
     tickSpacing: '100',
@@ -690,8 +817,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xc2830c07fd4e4e3f50006c0663d881b082c97536c3898d65094da7f71162ab1b',
     chainId: ChainId.MAINNET,
-    tvlUSD: 2640,
-    tvlETH: 0.708,
+    tvlUSD: 0,
+    tvlETH: 0,
     comment: 'USD0-USDC #75 Mainnet',
     feeTier: '0',
     tickSpacing: '10',
@@ -708,8 +835,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x037fdf1d5fff3a80e2bbc6855ce5a3741c09e10d0adc5b32bcbd19a5bd25763a',
     chainId: ChainId.BASE,
-    tvlUSD: 2530,
-    tvlETH: 0.678,
+    tvlUSD: 2550,
+    tvlETH: 0.55,
     comment: 'cbBTC-LBTC #1 Base',
     feeTier: '0',
     tickSpacing: '10',
@@ -726,8 +853,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x66fa569c8aa30894818043ff5e90656d8568208ee73c55cc812bdbb0b475fb71',
     chainId: ChainId.BASE,
-    tvlUSD: 2490,
-    tvlETH: 0.668,
+    tvlUSD: 2471,
+    tvlETH: 0.54,
     comment: 'WETH-USDC #36 Base',
     feeTier: '0',
     tickSpacing: '100',
@@ -762,8 +889,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xf409b4740b3a450fcd7b8657d4064846795b91bd456c802bed2fd5c88ca12a9c',
     chainId: ChainId.ARBITRUM_ONE,
-    tvlUSD: 1860,
-    tvlETH: 0.499,
+    tvlUSD: 0,
+    tvlETH: 0,
     comment: 'USDC-USDT #71 Arbitrum',
     feeTier: '0',
     tickSpacing: '5',
@@ -780,8 +907,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x690f92bc0598b82fa7dfea7cba108f54da349da46b22bc634795a9d34617b22c',
     chainId: ChainId.MAINNET,
-    tvlUSD: 1110,
-    tvlETH: 0.298,
+    tvlUSD: 1390,
+    tvlETH: 0.3,
     comment: 'USDC-frxUSD #45 Mainnet',
     feeTier: '0',
     tickSpacing: '2',
@@ -798,8 +925,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xfcb95f2277ef9524fb6a2e2c38209a7a3b955c34c933d2cdb570c1e9240fc475',
     chainId: ChainId.MAINNET,
-    tvlUSD: 800000,
-    tvlETH: 400,
+    tvlUSD: 249,
+    tvlETH: 0.05,
     comment: 'USDT/USDC',
     feeTier: '0',
     tickSpacing: '10',
@@ -816,8 +943,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x278ade56e33a097c673da54989ab41bc66d79d8362c38e7c7f2ae76a1d4e4e9f',
     chainId: ChainId.BASE,
-    tvlUSD: 420000,
-    tvlETH: 210,
+    tvlUSD: 947,
+    tvlETH: 0.21,
     comment: 'Flagship ETH-USDC 1.1',
     feeTier: '1',
     tickSpacing: '60',
@@ -834,8 +961,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0x52820f86a8b193cbb46184b990085535e5956003b0005569649125cc070d14d0',
     chainId: ChainId.ARBITRUM_ONE,
-    tvlUSD: 70000,
-    tvlETH: 210,
+    tvlUSD: 129,
+    tvlETH: 0.03,
     comment: 'USDC-USDT 1.0',
     feeTier: '1',
     tickSpacing: '10',
@@ -852,8 +979,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xccc788002cf655b20e41330bd9af113fd7df7cdebe68367574ea28cab1d59768',
     chainId: ChainId.MAINNET,
-    tvlUSD: 800000,
-    tvlETH: 400,
+    tvlUSD: 63,
+    tvlETH: 0.03,
     comment: 'ETH-wstETH 1.0',
     feeTier: '0',
     tickSpacing: '10',
@@ -870,8 +997,8 @@ export const BUNNI_POOLS_CONFIG = [
   {
     id: '0xcf3e20a072e6c74916da3e57086fa0f781ff54de4f060194e19aabf4dd94f55c',
     chainId: ChainId.ARBITRUM_ONE,
-    tvlUSD: 600000,
-    tvlETH: 300,
+    tvlUSD: 919,
+    tvlETH: 0.2,
     comment: 'ETH-wstETH 1.0',
     feeTier: '0',
     tickSpacing: '10',
@@ -884,4 +1011,167 @@ export const BUNNI_POOLS_CONFIG = [
       id: '0x5979d7b546e38e414f7e9822514be443a4800529',
     },
   },
+  // AlphaGrowth ETH-USDC
+  {
+    id: '0x5e5bc151fdb581faf0c28ae30ceba9193da793ccd7c22a70d3feaf3408c07666',
+    chainId: ChainId.UNICHAIN,
+    tvlUSD: 839457,
+    tvlETH: 182.91,
+    comment: 'AlphaGrowth ETH-USDC',
+    feeTier: '3',
+    tickSpacing: '10',
+    hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
+    liquidity: '173747248900',
+    token0: {
+      id: '0x0000000000000000000000000000000000000000',
+    },
+    token1: {
+      id: '0x078d782b760474a361dda0af3839290b0ef57ad6',
+    },
+  },
+  // ETH-GAPPY #285 Base
+  {
+    id: '0xf79d90031b6df08d90707ec0e908af750902c30339859ef77be45044607f6002',
+    chainId: ChainId.BASE,
+    tvlUSD: 13925,
+    tvlETH: 3.03,
+    comment: 'ETH-GAPPY #285 Base',
+    feeTier: '1',
+    tickSpacing: '60',
+    hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
+    liquidity: '173747248900',
+    token0: {
+      id: '0x0000000000000000000000000000000000000000',
+    },
+    token1: {
+      id: '0xfca9fc2cb2dde04732ad07e4bb73db8cc8bfed1d',
+    },
+  },
+  // BOLD-USND #57 Arbitrum
+  {
+    id: '0x2edd6d9772510c6d661dae96ac65838fd18a535763aaed2b4d5311c87c1cdf95',
+    chainId: ChainId.ARBITRUM_ONE,
+    tvlUSD: 36181,
+    tvlETH: 7.88,
+    comment: 'BOLD-USND #57 Arbitrum',
+    feeTier: '0',
+    tickSpacing: '10',
+    hooks: '0x0000eb22c45bdb564f985ace0b4d05a64fa71888',
+    liquidity: '173747248900',
+    token0: {
+      id: '0x03569cc076654f82679c4ba2124d64774781b01d',
+    },
+    token1: {
+      id: '0x4ecf61a6c2fab8a047ceb3b3b263b401763e9d49',
+    },
+  },
+  // USDC-SQD #20 BNB
+  {
+    id: '0xf5a8429ecdc6d0639124ebc9cc5474c79a1435d77c97bab7b007a1415446f2d0',
+    chainId: ChainId.BNB,
+    tvlUSD: 38744,
+    tvlETH: 8.44,
+    comment: 'USDC-SQD #20 BNB',
+    feeTier: '1',
+    tickSpacing: '100',
+    hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
+    liquidity: '173747248900',
+    token0: {
+      id: '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d',
+    },
+    token1: {
+      id: '0xe50e3d1a46070444f44df911359033f2937fcc13',
+    },
+  },
+  // PIRATE-USDC #102
+  {
+    id: '0x4ed145903fe1df284134dc9070825e4dea68b41917187373e664d7150c9a71d8',
+    chainId: ChainId.MAINNET,
+    tvlUSD: 21947,
+    tvlETH: 4.78,
+    comment: 'PIRATE-USDC #102',
+    feeTier: '0',
+    tickSpacing: '200',
+    hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
+    liquidity: '173747248900',
+    token0: {
+      id: '0x7613c48e0cd50e42dd9bf0f6c235063145f6f8dc',
+    },
+    token1: {
+      id: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    },
+  },
+  // ETH-USDC #308 Base
+  {
+    id: '0xb0370507155902bc7988b28c6a8ae35d953b49b40a19b8a72c4307a9e5e0fc3a',
+    chainId: ChainId.BASE,
+    tvlUSD: 6970,
+    tvlETH: 1.52,
+    comment: 'ETH-USDC #308 Base',
+    feeTier: '1',
+    tickSpacing: '12',
+    hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
+    liquidity: '173747248900',
+    token0: {
+      id: '0x0000000000000000000000000000000000000000',
+    },
+    token1: {
+      id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+    },
+  },
+  // WBTC-cbBTC #104
+  {
+    id: '0x89c981abd756429ac958425398d4d1b04db3c8c12a7f445bdc8abcc091b7bc90',
+    chainId: ChainId.MAINNET,
+    tvlUSD: 35660,
+    tvlETH: 7.77,
+    comment: 'WBTC-cbBTC #104',
+    feeTier: '0',
+    tickSpacing: '10',
+    hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
+    liquidity: '173747248900',
+    token0: {
+      id: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+    },
+    token1: {
+      id: '0xcbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+    },
+  },
+  // ETH-ZORA #326 Base
+  {
+    id: '0x28ecfada08cc1e5f50b2dea41cda4d3bbc73376390ebde6fa77d4971249577eb',
+    chainId: ChainId.BASE,
+    tvlUSD: 1290,
+    tvlETH: 0.28,
+    comment: 'ETH-ZORA #326 Base',
+    feeTier: '2',
+    tickSpacing: '100',
+    hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
+    liquidity: '173747248900',
+    token0: {
+      id: '0x0000000000000000000000000000000000000000',
+    },
+    token1: {
+      id: '0x1111111111166b7fe7bd91427724b487980afc69',
+    },
+  },
+  // ZORA-USDC #327 Base
+  {
+    id: '0x8a989f931a7a139fb35fc58e74367d52d93fb53688c84743f20b50063720fde6',
+    chainId: ChainId.BASE,
+    tvlUSD: 1310,
+    tvlETH: 0.29,
+    comment: 'ZORA-USDC #327 Base',
+    feeTier: '1',
+    tickSpacing: '100',
+    hooks: '0x000052423c1db6b7ff8641b85a7eefc7b2791888',
+    liquidity: '173747248900',
+    token0: {
+      id: '0x1111111111166b7fe7bd91427724b487980afc69',
+    },
+    token1: {
+      id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+    },
+  }
+   */
 ]
diff --git a/lib/util/v4HooksPoolsFiltering.ts b/lib/util/v4HooksPoolsFiltering.ts
index 41c163a2a9..64b1f22b02 100644
--- a/lib/util/v4HooksPoolsFiltering.ts
+++ b/lib/util/v4HooksPoolsFiltering.ts
@@ -1,9 +1,10 @@
-import { log, V4SubgraphPool } from '@uniswap/smart-order-router'
+import { isPoolFeeDynamic, log, nativeOnChain, V4SubgraphPool } from '@uniswap/smart-order-router'
 import { Hook } from '@uniswap/v4-sdk'
 import { HOOKS_ADDRESSES_ALLOWLIST } from './hooksAddressesAllowlist'
-import { ChainId } from '@uniswap/sdk-core'
+import { ChainId, Currency, Token } from '@uniswap/sdk-core'
 import { PriorityQueue } from '@datastructures-js/priority-queue'
 import { BUNNI_POOLS_CONFIG } from './bunni-pools'
+import { ADDRESS_ZERO } from '@uniswap/router-sdk'
 
 type V4PoolGroupingKey = string
 const TOP_GROUPED_V4_POOLS = 10
@@ -12,15 +13,30 @@ function convertV4PoolToGroupingKey(pool: V4SubgraphPool): V4PoolGroupingKey {
   return pool.token0.id.concat(pool.token1.id).concat(pool.feeTier)
 }
 
-function isHooksPoolRoutable(pool: V4SubgraphPool): boolean {
+function isHooksPoolRoutable(pool: V4SubgraphPool, chainId: ChainId): boolean {
+  const tokenA: Currency =
+    pool.token0.id === ADDRESS_ZERO
+      ? nativeOnChain(chainId)
+      : new Token(chainId, pool.token0.id, parseInt(pool.token0.decimals), pool.token0.symbol, pool.token0.name)
+  const tokenB: Currency =
+    pool.token1.id === ADDRESS_ZERO
+      ? nativeOnChain(chainId)
+      : new Token(chainId, pool.token1.id, parseInt(pool.token1.decimals), pool.token1.symbol, pool.token1.name)
+
   return (
-    !Hook.hasSwapPermissions(pool.hooks) &&
-    // If the fee tier is smaller than or equal to 100%, it means the pool is not dynamic fee pool.
-    // Swap fee in total can be 100% (https://github.com/Uniswap/v4-core/blob/b619b6718e31aa5b4fa0286520c455ceb950276d/src/libraries/SwapMath.sol#L12)
-    // Dynamic fee is at 0x800000 or 838.8608% fee tier.
-    // Since pool manager doesn;t check the fee at 100% max during pool initialization (https://github.com/Uniswap/v4-core/blob/main/src/PoolManager.sol#L128)
-    // it's more defensive programming to ensure the fee tier is less than or equal to 100%
-    Number(pool.feeTier) <= 1000000
+    // if hook address is ADDRESS_ZERO, it means the pool is not a hooks pool
+    pool.hooks === ADDRESS_ZERO ||
+    (!Hook.hasSwapPermissions(pool.hooks) &&
+      // If the fee tier is smaller than or equal to 100%, it means the pool is not dynamic fee pool.
+      // Swap fee in total can be 100% (https://github.com/Uniswap/v4-core/blob/b619b6718e31aa5b4fa0286520c455ceb950276d/src/libraries/SwapMath.sol#L12)
+      // Dynamic fee is at 0x800000 or 838.8608% fee tier.
+      // Since pool manager doesn;t check the fee at 100% max during pool initialization (https://github.com/Uniswap/v4-core/blob/main/src/PoolManager.sol#L128)
+      // it's more defensive programming to ensure the fee tier is less than or equal to 100%
+      Number(pool.feeTier) <= 1000000 &&
+      // ROUTE-606: Non-allowlisted hooks might make it in routing if dynamic fee
+      // there's a chance dynamic fee has been updated to be <= 100%, but it's still a dyanmic fee hooked pool
+      // in this case, the only way to track is to backtrack the computed pool id with 838% fee tier with the current pool id
+      !isPoolFeeDynamic(tokenA, tokenB, pool))
   )
 }
 
@@ -33,7 +49,7 @@ export function v4HooksPoolsFiltering(chainId: ChainId, pools: Array<V4SubgraphP
   const v4PoolsByTokenPairsAndFees: Record<V4PoolGroupingKey, PriorityQueue<V4SubgraphPool>> = {}
 
   pools.forEach((pool: V4SubgraphPool) => {
-    if (isHooksPoolRoutable(pool)) {
+    if (isHooksPoolRoutable(pool, chainId)) {
       const v4Pools =
         v4PoolsByTokenPairsAndFees[convertV4PoolToGroupingKey(pool)] ??
         new PriorityQueue<V4SubgraphPool>(V4SubgraphPoolComparator)
diff --git a/package-lock.json b/package-lock.json
index 519ec83661..9258fb504d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
         "@uniswap/permit2-sdk": "^1.3.0",
         "@uniswap/router-sdk": "^2.0.2",
         "@uniswap/sdk-core": "^7.7.1",
-        "@uniswap/smart-order-router": "4.22.15",
+        "@uniswap/smart-order-router": "4.22.18",
         "@uniswap/smart-wallet-sdk": "^2.1.1",
         "@uniswap/token-lists": "^1.0.0-beta.33",
         "@uniswap/universal-router-sdk": "^4.19.7",
@@ -4540,9 +4540,9 @@
       }
     },
     "node_modules/@uniswap/smart-order-router": {
-      "version": "4.22.15",
-      "resolved": "https://registry.npmjs.org/@uniswap/smart-order-router/-/smart-order-router-4.22.15.tgz",
-      "integrity": "sha512-DRugJvFy8DWyYEC36PFah2sAc2QNZ6y8StrSnc2ukcsDuq2WzDYIFsE5c3QVB4xsMrJS3viHYt4EZulIBXDJeg==",
+      "version": "4.22.18",
+      "resolved": "https://registry.npmjs.org/@uniswap/smart-order-router/-/smart-order-router-4.22.18.tgz",
+      "integrity": "sha512-Zf3/nyoewKhx2wfrFkOZf74Dv7RLZ2Y9RSH5jpc4OT1BkojrkrvLfseAmxWpERzKNzfV0KWh26232dLz477hvQ==",
       "dependencies": {
         "@eth-optimism/sdk": "^3.2.2",
         "@types/brotli": "^1.3.4",
@@ -28175,9 +28175,9 @@
       }
     },
     "@uniswap/smart-order-router": {
-      "version": "4.22.15",
-      "resolved": "https://registry.npmjs.org/@uniswap/smart-order-router/-/smart-order-router-4.22.15.tgz",
-      "integrity": "sha512-DRugJvFy8DWyYEC36PFah2sAc2QNZ6y8StrSnc2ukcsDuq2WzDYIFsE5c3QVB4xsMrJS3viHYt4EZulIBXDJeg==",
+      "version": "4.22.18",
+      "resolved": "https://registry.npmjs.org/@uniswap/smart-order-router/-/smart-order-router-4.22.18.tgz",
+      "integrity": "sha512-Zf3/nyoewKhx2wfrFkOZf74Dv7RLZ2Y9RSH5jpc4OT1BkojrkrvLfseAmxWpERzKNzfV0KWh26232dLz477hvQ==",
       "requires": {
         "@eth-optimism/sdk": "^3.2.2",
         "@types/brotli": "^1.3.4",
diff --git a/package.json b/package.json
index 39ae60885c..42da96838e 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@uniswap/permit2-sdk": "^1.3.0",
     "@uniswap/router-sdk": "^2.0.2",
     "@uniswap/sdk-core": "^7.7.1",
-    "@uniswap/smart-order-router": "4.22.15",
+    "@uniswap/smart-order-router": "4.22.18",
     "@uniswap/smart-wallet-sdk": "^2.1.1",
     "@uniswap/token-lists": "^1.0.0-beta.33",
     "@uniswap/universal-router-sdk": "^4.19.7",
diff --git a/test/jest/unit/handlers/util/v4HooksPoolsFiltering.test.ts b/test/jest/unit/handlers/util/v4HooksPoolsFiltering.test.ts
index 245d01716a..1ef34e8f81 100644
--- a/test/jest/unit/handlers/util/v4HooksPoolsFiltering.test.ts
+++ b/test/jest/unit/handlers/util/v4HooksPoolsFiltering.test.ts
@@ -14,10 +14,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: flaunchHookAddress,
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -37,10 +43,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -52,10 +64,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: beforeSwapHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
@@ -75,10 +93,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -90,10 +114,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: afterSwapHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
@@ -114,25 +144,37 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
       },
       {
-        id: '1',
+        id: '0xed57ea6c3322a14a7891120371ff22b5c3f8ce812cf0d740658128c9ba313a16',
         feeTier: dynamicFee,
         tickSpacing: '1',
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
@@ -152,10 +194,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -167,17 +215,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: beforeInitializeHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('after initialize hooks pool is not filtered out', () => {
@@ -190,10 +244,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -205,17 +265,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: afterInitializeHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('before add liquidity hooks pool is not filtered out', () => {
@@ -228,10 +294,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -243,17 +315,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: beforeAddLiquidityHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('after add liquidity hooks pool is not filtered out', () => {
@@ -266,10 +344,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -281,17 +365,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: afterAddLiquidityHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('before remove liquidity hooks pool is not filtered out', () => {
@@ -304,10 +394,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -319,17 +415,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: beforeRemoveLiquidityHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('after remove liquidity hooks pool is not filtered out', () => {
@@ -342,10 +444,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -357,17 +465,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: afterRemoveLiquidityHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('before donate hooks pool is not filtered out', () => {
@@ -380,10 +494,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -395,17 +515,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: beforeDonateHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('after donate hooks pool is not filtered out', () => {
@@ -418,10 +544,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -433,17 +565,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: afterDonateHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('before swap returns delta hooks pool is not filtered out', () => {
@@ -456,10 +594,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -471,17 +615,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: beforeSwapReturnsDeltaHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('after swap returns delta hooks pool is not filtered out', () => {
@@ -494,10 +644,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -509,17 +665,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: afterSwapReturnsDeltaHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('after add liquidity returns delta hooks pool is not filtered out', () => {
@@ -532,10 +694,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -547,17 +715,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: afterAddLiquidityReturnsDeltaHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('after remove liquidity returns delta hooks pool is not filtered out', () => {
@@ -570,10 +744,16 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: '0x0000000000000000000000000000000000000020',
         liquidity: '0',
         token0: {
-          id: '0',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '0',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 0,
         tvlUSD: 0,
@@ -585,17 +765,23 @@ describe('v4HooksPoolsFiltering', () => {
         hooks: afterRemoveLiquidityReturnsDeltaHookAddress,
         liquidity: '1',
         token0: {
-          id: '1',
+          symbol: 'USDC',
+          id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+          name: 'USD Coin',
+          decimals: '6',
         },
         token1: {
-          id: '1',
+          symbol: 'ETH',
+          id: '0x0000000000000000000000000000000000000000',
+          name: 'Ether',
+          decimals: '18',
         },
         tvlETH: 1,
         tvlUSD: 1,
       },
     ]
 
-    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[1], v4Pools[0]])
+    expect(v4HooksPoolsFiltering(1, v4Pools)).toEqual([v4Pools[0], v4Pools[1]])
   })
 
   it('11 hooks pool to retain 10 pools', () => {
@@ -607,10 +793,16 @@ describe('v4HooksPoolsFiltering', () => {
       hooks: afterRemoveLiquidityReturnsDeltaHookAddress,
       liquidity: i,
       token0: {
-        id: 'USDC',
+        symbol: 'USDC',
+        id: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+        name: 'USD Coin',
+        decimals: '6',
       },
       token1: {
-        id: 'ETH',
+        symbol: 'ETH',
+        id: '0x0000000000000000000000000000000000000000',
+        name: 'Ether',
+        decimals: '18',
       },
       tvlETH: Number(i),
       tvlUSD: Number(i),