diff --git a/models/silver/abis/silver__abis.sql b/models/silver/abis/silver__abis.sql
index 1ef2842..5d0d4a2 100644
--- a/models/silver/abis/silver__abis.sql
+++ b/models/silver/abis/silver__abis.sql
@@ -2,7 +2,7 @@
     materialized = "incremental",
     unique_key = "contract_address",
     merge_exclude_columns = ["inserted_timestamp"],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION on equality(contract_address)",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(contract_address,abi_hash,bytecode), SUBSTRING(contract_address,abi_hash,bytecode)",
     tags = ['abis']
 ) }}
 
diff --git a/models/silver/core/silver__blocks.sql b/models/silver/core/silver__blocks.sql
index e7f0614..2b6e9af 100644
--- a/models/silver/core/silver__blocks.sql
+++ b/models/silver/core/silver__blocks.sql
@@ -5,6 +5,7 @@
     cluster_by = "block_timestamp::date",
     tags = ['core','non_realtime'],
     merge_exclude_columns = ["inserted_timestamp"],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(hash,parent_hash,receipts_root,sha3_uncles,state_root,transactions_root,withdrawals_root)",
     full_refresh = false
 ) }}
 
diff --git a/models/silver/core/silver__contracts.sql b/models/silver/core/silver__contracts.sql
index 5f8583f..257599f 100644
--- a/models/silver/core/silver__contracts.sql
+++ b/models/silver/core/silver__contracts.sql
@@ -2,6 +2,7 @@
     materialized = 'incremental',
     unique_key = 'contract_address',
     merge_exclude_columns = ["inserted_timestamp"],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(contract_address, token_symbol, token_name), SUBSTRING(contract_address, token_symbol, token_name)",
     tags = ['non_realtime']
 ) }}
 
diff --git a/models/silver/core/silver__created_contracts.sql b/models/silver/core/silver__created_contracts.sql
index 6874be2..3ec66a4 100644
--- a/models/silver/core/silver__created_contracts.sql
+++ b/models/silver/core/silver__created_contracts.sql
@@ -2,6 +2,7 @@
     materialized = "incremental",
     unique_key = "created_contract_address",
     merge_exclude_columns = ["inserted_timestamp"],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(block_timestamp, tx_hash, created_contract_address, creator_address), SUBSTRING(created_contract_address, creator_address)",
     tags = ['non_realtime']
 ) }}
 
diff --git a/models/silver/core/silver__receipts.sql b/models/silver/core/silver__receipts.sql
index af847e5..2940004 100644
--- a/models/silver/core/silver__receipts.sql
+++ b/models/silver/core/silver__receipts.sql
@@ -4,7 +4,7 @@
     incremental_strategy = 'delete+insert',
     unique_key = "block_number",
     cluster_by = "ROUND(block_number, -3)",
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION on equality(tx_hash)",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(block_hash, tx_hash, from_address, to_address)",
     tags = ['core','non_realtime'],
     full_refresh = false
 ) }}
diff --git a/models/silver/core/silver__transfers.sql b/models/silver/core/silver__transfers.sql
index 0592226..dc688df 100644
--- a/models/silver/core/silver__transfers.sql
+++ b/models/silver/core/silver__transfers.sql
@@ -4,6 +4,7 @@
     incremental_strategy = 'delete+insert',
     unique_key = "block_number",
     cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, origin_function_signature, origin_from_address, origin_to_address, contract_address, from_address, to_address, symbol), SUBSTRING(origin_function_signature, contract_address, from_address, to_address, symbol)",
     tags = ['non_realtime','reorg','heal']
 ) }}
 
diff --git a/models/silver/defi/bridge/silver_bridge__complete_bridge_activity.sql b/models/silver/defi/bridge/silver_bridge__complete_bridge_activity.sql
index 7354530..9ed8ca0 100644
--- a/models/silver/defi/bridge/silver_bridge__complete_bridge_activity.sql
+++ b/models/silver/defi/bridge/silver_bridge__complete_bridge_activity.sql
@@ -3,7 +3,8 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = ['block_number','platform','version'],
-    cluster_by = ['block_timestamp::DATE'],
+    cluster_by = ['block_timestamp::DATE','platform'],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, origin_from_address, origin_to_address, origin_function_signature, bridge_address, sender, receiver, destination_chain_receiver, destination_chain_id, destination_chain, token_address, token_symbol), SUBSTRING(origin_function_signature, bridge_address, sender, receiver, destination_chain_receiver, destination_chain, token_address, token_symbol)",
     tags = ['curated','reorg','heal']
 ) }}
 
diff --git a/models/silver/defi/dex/silver_dex__complete_dex_liquidity_pools.sql b/models/silver/defi/dex/silver_dex__complete_dex_liquidity_pools.sql
index 25e4db6..914ee34 100644
--- a/models/silver/defi/dex/silver_dex__complete_dex_liquidity_pools.sql
+++ b/models/silver/defi/dex/silver_dex__complete_dex_liquidity_pools.sql
@@ -2,7 +2,8 @@
   materialized = 'incremental',
   incremental_strategy = 'delete+insert',
   unique_key = ['block_number','platform','version'],
-  cluster_by = ['block_timestamp::DATE'],
+  cluster_by = ['block_timestamp::DATE','platform'],
+  post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, contract_address, pool_address, pool_name, tokens, symbols), SUBSTRING(pool_address, pool_name, tokens, symbols)",
   tags = ['curated','reorg','heal']
 ) }}
 
diff --git a/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql b/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql
index 42eeb51..8572f13 100644
--- a/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql
+++ b/models/silver/defi/dex/silver_dex__complete_dex_swaps.sql
@@ -3,7 +3,8 @@
   materialized = 'incremental',
   incremental_strategy = 'delete+insert',
   unique_key = ['block_number','platform','version'],
-  cluster_by = ['block_timestamp::DATE'],
+  cluster_by = ['block_timestamp::DATE','platform'],
+  post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, origin_function_signature, origin_from_address, origin_to_address, contract_address, pool_name, event_name, sender, tx_to, token_in, token_out, symbol_in, symbol_out), SUBSTRING(origin_function_signature, pool_name, event_name, sender, tx_to, token_in, token_out, symbol_in, symbol_out)",
   tags = ['curated','reorg','heal']
 ) }}
 
diff --git a/models/silver/defi/lending/complete_lending/silver__complete_lending_borrows.sql b/models/silver/defi/lending/complete_lending/silver__complete_lending_borrows.sql
index 3903334..d846591 100644
--- a/models/silver/defi/lending/complete_lending/silver__complete_lending_borrows.sql
+++ b/models/silver/defi/lending/complete_lending/silver__complete_lending_borrows.sql
@@ -3,7 +3,8 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = ['block_number','platform'],
-    cluster_by = ['block_timestamp::DATE'],
+    cluster_by = ['block_timestamp::DATE','platform'],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, origin_from_address, origin_to_address, origin_function_signature, contract_address, event_name, token_address, token_symbol, borrower, protocol_market), SUBSTRING(origin_function_signature, event_name, token_address, token_symbol, borrower, protocol_market)",
     tags = ['reorg','curated','heal']
 ) }}
 
diff --git a/models/silver/defi/lending/complete_lending/silver__complete_lending_deposits.sql b/models/silver/defi/lending/complete_lending/silver__complete_lending_deposits.sql
index 45a51a2..bd6fb2f 100644
--- a/models/silver/defi/lending/complete_lending/silver__complete_lending_deposits.sql
+++ b/models/silver/defi/lending/complete_lending/silver__complete_lending_deposits.sql
@@ -3,7 +3,8 @@
   materialized = 'incremental',
   incremental_strategy = 'delete+insert',
   unique_key = ['block_number','platform'],
-  cluster_by = ['block_timestamp::DATE'],
+  cluster_by = ['block_timestamp::DATE','platform'],
+  post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, origin_from_address, origin_to_address, origin_function_signature, contract_address, event_name, token_address, token_symbol, depositor, protocol_market), SUBSTRING(origin_function_signature, event_name, token_address, token_symbol, depositor, protocol_market)",
   tags = ['reorg','curated','heal']
 ) }}
 
diff --git a/models/silver/defi/lending/complete_lending/silver__complete_lending_flashloans.sql b/models/silver/defi/lending/complete_lending/silver__complete_lending_flashloans.sql
index 7975754..f7616a4 100644
--- a/models/silver/defi/lending/complete_lending/silver__complete_lending_flashloans.sql
+++ b/models/silver/defi/lending/complete_lending/silver__complete_lending_flashloans.sql
@@ -3,7 +3,8 @@
   materialized = 'incremental',
   incremental_strategy = 'delete+insert',
   unique_key = ['block_number','platform'],
-  cluster_by = ['block_timestamp::DATE'],
+  cluster_by = ['block_timestamp::DATE','platform'],
+  post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, origin_from_address, origin_to_address, origin_function_signature, contract_address, event_name, flashloan_token, flashloan_token_symbol, protocol_market), SUBSTRING(origin_function_signature, event_name, flashloan_token, flashloan_token_symbol, protocol_market)",
   tags = ['reorg','curated','heal']
 ) }}
 
diff --git a/models/silver/defi/lending/complete_lending/silver__complete_lending_liquidations.sql b/models/silver/defi/lending/complete_lending/silver__complete_lending_liquidations.sql
index 9136369..7257549 100644
--- a/models/silver/defi/lending/complete_lending/silver__complete_lending_liquidations.sql
+++ b/models/silver/defi/lending/complete_lending/silver__complete_lending_liquidations.sql
@@ -3,7 +3,8 @@
   materialized = 'incremental',
   incremental_strategy = 'delete+insert',
   unique_key = ['block_number','platform'],
-  cluster_by = ['block_timestamp::DATE'],
+  cluster_by = ['block_timestamp::DATE','platform'],
+  post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, origin_from_address, origin_to_address, origin_function_signature, contract_address, event_name, liquidator, borrower, collateral_token, collateral_token_symbol, debt_token, debt_token_symbol, protocol_market), SUBSTRING(origin_function_signature, event_name, liquidator, borrower, collateral_token, collateral_token_symbol, debt_token, debt_token_symbol, protocol_market)",
   tags = ['reorg','curated','heal']
 ) }}
 
diff --git a/models/silver/defi/lending/complete_lending/silver__complete_lending_repayments.sql b/models/silver/defi/lending/complete_lending/silver__complete_lending_repayments.sql
index e294c7a..845846f 100644
--- a/models/silver/defi/lending/complete_lending/silver__complete_lending_repayments.sql
+++ b/models/silver/defi/lending/complete_lending/silver__complete_lending_repayments.sql
@@ -3,7 +3,8 @@
   materialized = 'incremental',
   incremental_strategy = 'delete+insert',
   unique_key = ['block_number','platform'],
-  cluster_by = ['block_timestamp::DATE'],
+  cluster_by = ['block_timestamp::DATE','platform'],
+  post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, origin_from_address, origin_to_address, origin_function_signature, contract_address, event_name, token_address, token_symbol, payer, borrower, protocol_market), SUBSTRING(origin_function_signature, event_name, token_address, token_symbol, payer, borrower, protocol_market)",
   tags = ['reorg','curated','heal']
 ) }}
 
diff --git a/models/silver/defi/lending/complete_lending/silver__complete_lending_withdraws.sql b/models/silver/defi/lending/complete_lending/silver__complete_lending_withdraws.sql
index 9bdab47..54404fd 100644
--- a/models/silver/defi/lending/complete_lending/silver__complete_lending_withdraws.sql
+++ b/models/silver/defi/lending/complete_lending/silver__complete_lending_withdraws.sql
@@ -3,7 +3,8 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = ['block_number','platform'],
-    cluster_by = ['block_timestamp::DATE'],
+    cluster_by = ['block_timestamp::DATE','platform'],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, origin_from_address, origin_to_address, origin_function_signature, contract_address, event_name, token_address, token_symbol, depositor, protocol_market), SUBSTRING(origin_function_signature, event_name, token_address, token_symbol, depositor, protocol_market)",
     tags = ['reorg','curated','heal']
 ) }}
 
diff --git a/models/silver/labels/silver__labels.sql b/models/silver/labels/silver__labels.sql
index 55a5fa5..ed35013 100644
--- a/models/silver/labels/silver__labels.sql
+++ b/models/silver/labels/silver__labels.sql
@@ -4,7 +4,7 @@
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
     cluster_by = 'modified_timestamp::DATE',
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(address); DELETE FROM {{ this }} WHERE _is_deleted = TRUE;",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(address, label_type, label_subtype, address_name, project_name), SUBSTRING(address, label_type, label_subtype, address_name, project_name); DELETE FROM {{ this }} WHERE _is_deleted = TRUE;",
     tags = ['non_realtime']
 ) }}
 
diff --git a/models/silver/nft/sales/silver__complete_nft_sales.sql b/models/silver/nft/sales/silver__complete_nft_sales.sql
index 600dec4..9a4572d 100644
--- a/models/silver/nft/sales/silver__complete_nft_sales.sql
+++ b/models/silver/nft/sales/silver__complete_nft_sales.sql
@@ -2,7 +2,8 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = ['block_number','platform_exchange_version'],
-    cluster_by = ['block_timestamp::DATE'],
+    cluster_by = ['block_timestamp::DATE','platform_name'],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(origin_function_signature, event_type, platform_address, platform_exchange_version, seller_address, buyer_address, nft_address, project_name, currency_address, currency_symbol), SUBSTRING(tx_hash, origin_function_signature, origin_from_address, origin_to_address, event_type, platform_address, platform_exchange_version, seller_address, buyer_address, nft_address, project_name, currency_address, currency_symbol)",
     tags = ['curated','reorg', 'heal']
 ) }}
 
diff --git a/models/silver/nft/silver__nft_transfers.sql b/models/silver/nft/silver__nft_transfers.sql
index 0370498..ab8d4bc 100644
--- a/models/silver/nft/silver__nft_transfers.sql
+++ b/models/silver/nft/silver__nft_transfers.sql
@@ -3,7 +3,7 @@
     incremental_strategy = 'delete+insert',
     unique_key = "block_number",
     cluster_by = ['block_timestamp::DATE', '_inserted_timestamp::DATE'],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION on equality(contract_address, tx_hash)",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_hash, contract_address, project_name, from_address, to_address, event_type, token_transfer_type), SUBSTRING(contract_address, project_name, from_address, to_address, event_type, token_transfer_type)",
     tags = ['curated','reorg', 'heal']
 ) }}
 
diff --git a/models/silver/prices/silver__complete_native_asset_metadata.sql b/models/silver/prices/silver__complete_native_asset_metadata.sql
index f06d593..a81b6a6 100644
--- a/models/silver/prices/silver__complete_native_asset_metadata.sql
+++ b/models/silver/prices/silver__complete_native_asset_metadata.sql
@@ -2,6 +2,7 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = 'complete_native_asset_metadata_id',
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(asset_id, symbol, name),SUBSTRING(asset_id, symbol, name)",
     tags = ['non_realtime']
 ) }}
 
diff --git a/models/silver/prices/silver__complete_native_prices.sql b/models/silver/prices/silver__complete_native_prices.sql
index 375cbed..ec99925 100644
--- a/models/silver/prices/silver__complete_native_prices.sql
+++ b/models/silver/prices/silver__complete_native_prices.sql
@@ -2,6 +2,8 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = 'complete_native_prices_id',
+    cluster_by = ['hour::DATE'],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(asset_id, symbol, name),SUBSTRING(asset_id, symbol, name)",
     tags = ['non_realtime']
 ) }}
 
diff --git a/models/silver/prices/silver__complete_provider_asset_metadata.sql b/models/silver/prices/silver__complete_provider_asset_metadata.sql
index a22da44..b981c9c 100644
--- a/models/silver/prices/silver__complete_provider_asset_metadata.sql
+++ b/models/silver/prices/silver__complete_provider_asset_metadata.sql
@@ -2,6 +2,7 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = 'complete_provider_asset_metadata_id',
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(asset_id, token_address, symbol, name),SUBSTRING(asset_id, token_address, symbol, name)",
     tags = ['non_realtime']
 ) }}
 
diff --git a/models/silver/prices/silver__complete_provider_prices.sql b/models/silver/prices/silver__complete_provider_prices.sql
index c6aa062..a8be434 100644
--- a/models/silver/prices/silver__complete_provider_prices.sql
+++ b/models/silver/prices/silver__complete_provider_prices.sql
@@ -2,6 +2,8 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = 'complete_provider_prices_id',
+    cluster_by = ['recorded_hour::DATE','provider'],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(asset_id),SUBSTRING(asset_id)",
     tags = ['non_realtime']
 ) }}
 
diff --git a/models/silver/prices/silver__complete_token_asset_metadata.sql b/models/silver/prices/silver__complete_token_asset_metadata.sql
index 2dfc8a3..f5339b8 100644
--- a/models/silver/prices/silver__complete_token_asset_metadata.sql
+++ b/models/silver/prices/silver__complete_token_asset_metadata.sql
@@ -2,6 +2,7 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = 'complete_token_asset_metadata_id',
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(asset_id, token_address, symbol, name),SUBSTRING(asset_id, token_address, symbol, name)",
     tags = ['non_realtime']
 ) }}
 
diff --git a/models/silver/prices/silver__complete_token_prices.sql b/models/silver/prices/silver__complete_token_prices.sql
index f343d5a..f8e6442 100644
--- a/models/silver/prices/silver__complete_token_prices.sql
+++ b/models/silver/prices/silver__complete_token_prices.sql
@@ -2,6 +2,8 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = 'complete_token_prices_id',
+    cluster_by = ['hour::DATE'],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(asset_id, token_address, symbol, name),SUBSTRING(asset_id, token_address, symbol, name)",
     tags = ['non_realtime']
 ) }}