diff --git a/dbt_subprojects/hourly_spellbook/models/_project/lido/accounting/ethereum/lido_accounting_ethereum_other_income.sql b/dbt_subprojects/hourly_spellbook/models/_project/lido/accounting/ethereum/lido_accounting_ethereum_other_income.sql
index 04b0a2375b6..4ca05c97a4a 100644
--- a/dbt_subprojects/hourly_spellbook/models/_project/lido/accounting/ethereum/lido_accounting_ethereum_other_income.sql
+++ b/dbt_subprojects/hourly_spellbook/models/_project/lido/accounting/ethereum/lido_accounting_ethereum_other_income.sql
@@ -293,6 +293,7 @@ with tokens as (
 		and i.pre_token_balance is not null
 		and i.token_mint_address = '7dHbWXmci3dT8UFYWYZweBLXgycu7Y3iL6trKn1Y7ARj'
 		and i.address = 'CYpYPtwY9QVmZsjCmguAud1ctQjXWKpWD7xeL5mnpcXk'
+		and i.address_prefix = 'CY'
 		and i.token_balance_change > 0
 )
 
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/alpha_dex_solana_bot_users.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/alpha_dex_solana_bot_users.sql
index b21a64e673b..052371bfa9a 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/alpha_dex_solana_bot_users.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/alpha_dex_solana_bot_users.sql
@@ -30,3 +30,4 @@ where
     tx_success
     and balance_change > 0
     and address = '{{fee_receiver}}'
+    and address_prefix = '{{ fee_receiver[:2] }}'
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/autosnipe_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/autosnipe_solana_bot_trades.sql
index ecdd68d7ce8..478ac59581e 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/autosnipe_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/autosnipe_solana_bot_trades.sql
@@ -32,7 +32,7 @@ WITH
       AND tx_success
       AND balance_change > 0
       AND address = '{{fee_receiver_1}}'
-        
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/banana_gun_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/banana_gun_solana_bot_trades.sql
index dbc750f0349..7ef2dff3c66 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/banana_gun_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/banana_gun_solana_bot_trades.sql
@@ -48,6 +48,7 @@ WITH
         OR address = '{{fee_receiver_7}}'
         OR address = '{{fee_receiver_8}}'
       )
+      AND address_prefix IN ('{{ fee_receiver_1[:2] }}', '{{ fee_receiver_2[:2] }}', '{{ fee_receiver_3[:2] }}', '{{ fee_receiver_4[:2] }}', '{{ fee_receiver_5[:2] }}', '{{ fee_receiver_6[:2] }}', '{{ fee_receiver_7[:2] }}', '{{ fee_receiver_8[:2] }}')
       AND tx_id != 'AT915GhHaLdGsdFkywx2uE6jqSXeyTauveYH2BQqWMyptGhUtjE6dcdr74ErELg79VY9apZ9Egiyc1VtA6Ddykb' -- Edge case that sent fees to multiple fee wallets
   ),
   botTrades AS (
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/bitfoot_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/bitfoot_solana_bot_trades.sql
index d344a273166..aad3a7b9d2f 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/bitfoot_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/bitfoot_solana_bot_trades.sql
@@ -31,9 +31,8 @@ WITH
       {% endif %}
       AND tx_success
       AND balance_change > 0
-      AND (
-        address = '{{fee_receiver_1}}'
-      )
+      AND address = '{{fee_receiver_1}}'
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/bloom_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/bloom_solana_bot_trades.sql
index 08822c510d2..e392db9503a 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/bloom_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/bloom_solana_bot_trades.sql
@@ -32,7 +32,7 @@ WITH
       AND tx_success
       AND balance_change > 0
       AND address = '{{fee_receiver_1}}'
-        
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/consortium_key_solana_bot_users.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/consortium_key_solana_bot_users.sql
index 6a0da46c253..7c8ff5128de 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/consortium_key_solana_bot_users.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/consortium_key_solana_bot_users.sql
@@ -30,3 +30,4 @@ where
     tx_success
     and balance_change > 0
     and address = '{{fee_receiver}}'
+    and address_prefix = '{{ fee_receiver[:2] }}'
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/cswap_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/cswap_solana_bot_trades.sql
index 13700129417..c1196a17a66 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/cswap_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/cswap_solana_bot_trades.sql
@@ -31,9 +31,8 @@ WITH
       {% endif %}
       AND tx_success
       AND balance_change > 0
-      AND (
-        address = '{{fee_receiver_1}}'
-      )
+      AND address = '{{fee_receiver_1}}'
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/falcon_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/falcon_solana_bot_trades.sql
index c97db192614..3a2cbfeaef7 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/falcon_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/falcon_solana_bot_trades.sql
@@ -32,7 +32,7 @@ WITH
       AND tx_success
       AND balance_change > 0
       AND address = '{{fee_receiver_1}}'
-     
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/jupbot_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/jupbot_solana_bot_trades.sql
index a41f9c295c0..18453c10d05 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/jupbot_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/jupbot_solana_bot_trades.sql
@@ -32,7 +32,7 @@ WITH
       AND tx_success
       AND balance_change > 0
       AND address = '{{buy_fee_receiver_1}}'
-
+      AND address_prefix = '{{ buy_fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/looter_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/looter_solana_bot_trades.sql
index 2290e49c6ca..79a6626cf82 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/looter_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/looter_solana_bot_trades.sql
@@ -36,6 +36,7 @@ with
             and tx_success
             and balance_change > 0
             and address = '{{fee_receiver}}'
+            and address_prefix = '{{ fee_receiver[:2] }}'
     ),
     bot_trades as (
         select
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/maestro_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/maestro_solana_bot_trades.sql
index e2dee591ed1..8f235b78f53 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/maestro_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/maestro_solana_bot_trades.sql
@@ -33,6 +33,7 @@ WITH
       AND tx_success
       AND balance_change > 0
       AND (address = '{{fee_receiver_1}}' OR address = '{{fee_receiver_2}}')
+      AND address_prefix IN ('{{ fee_receiver_1[:2] }}', '{{ fee_receiver_2[:2] }}')
   ),
   zeroFeeTrades AS (
    SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/magnum_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/magnum_solana_bot_trades.sql
index 76996f38b16..56945c9f3ec 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/magnum_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/magnum_solana_bot_trades.sql
@@ -36,6 +36,7 @@ WITH
         address = '{{fee_receiver_1}}'
         OR address = '{{fee_receiver_2}}'
       )
+      AND address_prefix IN ('{{ fee_receiver_1[:2] }}', '{{ fee_receiver_2[:2] }}')
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/mev_x_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/mev_x_solana_bot_trades.sql
index b2f8427f999..07b54840932 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/mev_x_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/mev_x_solana_bot_trades.sql
@@ -38,6 +38,7 @@ WITH
         OR address = '{{sell_fee_receiver_1}}'
         OR address = '{{sell_fee_receiver_2}}'
       )
+      AND address_prefix IN ('{{ buy_fee_receiver_1[:2] }}', '{{ sell_fee_receiver_1[:2] }}', '{{ sell_fee_receiver_2[:2] }}')
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/nova_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/nova_solana_bot_trades.sql
index c0465855f4f..5479647faad 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/nova_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/nova_solana_bot_trades.sql
@@ -31,9 +31,8 @@ WITH
       {% endif %}
       AND tx_success
       AND balance_change > 0
-      AND (
-        address = '{{fee_receiver_1}}'
-      )
+      AND address = '{{fee_receiver_1}}'
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/padre_solana_bot_users.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/padre_solana_bot_users.sql
index 66d7c5a3b1e..1ef39ee9461 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/padre_solana_bot_users.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/padre_solana_bot_users.sql
@@ -30,3 +30,4 @@ where
     tx_success
     and balance_change > 0
     and address = '{{fee_receiver}}'
+    and address_prefix = '{{ fee_receiver[:2] }}'
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/pepe_boost_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/pepe_boost_solana_bot_trades.sql
index 1c30184091e..ee133dde1c3 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/pepe_boost_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/pepe_boost_solana_bot_trades.sql
@@ -40,6 +40,7 @@ WITH
       AND tx_success
       AND balance_change > 0
       AND address = '{{fee_receiver}}'
+      AND address_prefix = '{{ fee_receiver[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/pinkpunk_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/pinkpunk_solana_bot_trades.sql
index 530764de0df..5cdfb907528 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/pinkpunk_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/pinkpunk_solana_bot_trades.sql
@@ -36,6 +36,7 @@ WITH
         address = '{{fee_receiver_1}}'
         OR address = '{{fee_receiver_2}}'
       )
+      AND address_prefix IN ('{{ fee_receiver_1[:2] }}', '{{ fee_receiver_2[:2] }}')
   ),
   bot_trades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/prophetbots_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/prophetbots_solana_bot_trades.sql
index 34164abba79..e5afedbbe75 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/prophetbots_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/prophetbots_solana_bot_trades.sql
@@ -33,6 +33,7 @@ WITH
       AND tx_success
       AND balance_change > 0
       AND (address = '{{fee_receiver_1}}' OR address = '{{fee_receiver_2}}')
+      AND address_prefix IN ('{{ fee_receiver_1[:2] }}', '{{ fee_receiver_2[:2] }}')
       GROUP BY tx_id
   ),
   botTrades AS (
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sanji_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sanji_solana_bot_trades.sql
index 7bbe10a3628..856efe9c532 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sanji_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sanji_solana_bot_trades.sql
@@ -31,9 +31,8 @@ WITH
       {% endif %}
       AND tx_success
       AND balance_change > 0
-      AND (
-        address = '{{fee_receiver_1}}'
-      )
+      AND address = '{{fee_receiver_1}}'
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/shuriken_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/shuriken_solana_bot_trades.sql
index 4bf08af0b0f..50eafdf4c95 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/shuriken_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/shuriken_solana_bot_trades.sql
@@ -32,6 +32,7 @@ WITH
       AND tx_success
       AND balance_change > 0
       AND address = '{{fee_receiver}}'
+      AND address_prefix = '{{ fee_receiver[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sol_gun_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sol_gun_solana_bot_trades.sql
index a74c4952b0e..28e95b89304 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sol_gun_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sol_gun_solana_bot_trades.sql
@@ -31,9 +31,8 @@ WITH
       {% endif %}
       AND tx_success
       AND balance_change > 0
-      AND (
-        address = '{{fee_receiver_1}}'
-      )
+      AND address = '{{fee_receiver_1}}'
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sol_trading_bot_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sol_trading_bot_solana_bot_trades.sql
index 5404684b48a..e71bbd6b41b 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sol_trading_bot_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/sol_trading_bot_solana_bot_trades.sql
@@ -40,6 +40,7 @@ WITH
         OR address = '{{buy_fee_receiver_2}}'
         OR address = '{{sell_fee_receiver_2}}'
       )
+      AND address_prefix IN ('{{ buy_fee_receiver_1[:2] }}', '{{ sell_fee_receiver_1[:2] }}', '{{ buy_fee_receiver_2[:2] }}', '{{ sell_fee_receiver_2[:2] }}')
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/soul_sniper_solana_bot_users.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/soul_sniper_solana_bot_users.sql
index cd0de3efdfd..e4d857894bd 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/soul_sniper_solana_bot_users.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/soul_sniper_solana_bot_users.sql
@@ -30,3 +30,4 @@ where
     tx_success
     and balance_change > 0
     and address = '{{fee_receiver}}'
+    and address_prefix = '{{ fee_receiver[:2] }}'
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/tirador_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/tirador_solana_bot_trades.sql
index e135e65ff0f..d4bcd7df404 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/tirador_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/tirador_solana_bot_trades.sql
@@ -31,9 +31,8 @@ WITH
       {% endif %}
       AND tx_success
       AND balance_change > 0
-      AND (
-        address = '{{fee_receiver_1}}'
-      )
+      AND address = '{{fee_receiver_1}}'
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/tradewiz_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/tradewiz_solana_bot_trades.sql
index 40b9098fe8e..e39d24146db 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/tradewiz_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/tradewiz_solana_bot_trades.sql
@@ -31,9 +31,8 @@ WITH
       {% endif %}
       AND tx_success
       AND balance_change > 0
-      AND (
-        address = '{{fee_receiver_1}}'
-      )
+      AND address = '{{fee_receiver_1}}'
+      AND address_prefix = '{{ fee_receiver_1[:2] }}'
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/trojan_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/trojan_solana_bot_trades.sql
index 8f144362338..c7391d60d5f 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/trojan_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/trojan_solana_bot_trades.sql
@@ -36,6 +36,7 @@ WITH
         address = '{{fee_receiver_1}}'
         OR address = '{{fee_receiver_2}}'
       )
+      AND address_prefix IN ('{{ fee_receiver_1[:2] }}', '{{ fee_receiver_2[:2] }}')
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/unibot_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/unibot_solana_bot_trades.sql
index 1eabb264db2..0e963062b46 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/unibot_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/unibot_solana_bot_trades.sql
@@ -36,6 +36,7 @@ WITH
         address = '{{fee_receiver_1}}'
         OR address = '{{fee_receiver_2}}'
       )
+      AND address_prefix IN ('{{ fee_receiver_1[:2] }}', '{{ fee_receiver_2[:2] }}')
   ),
   botTrades AS (
     SELECT
diff --git a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/wifbot_solana_bot_trades.sql b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/wifbot_solana_bot_trades.sql
index 7709f53abae..1929dbb87e0 100644
--- a/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/wifbot_solana_bot_trades.sql
+++ b/dbt_subprojects/solana/models/_sector/dex/bot_trades/solana/platforms/wifbot_solana_bot_trades.sql
@@ -37,6 +37,7 @@ with
             and tx_success
             and balance_change > 0
             and address = '{{fee_receiver}}'
+            and address_prefix = '{{ fee_receiver[:2] }}'
     ),
     bot_trades as (
         select