diff --git a/models/silver/core/silver__streamline_events.sql b/models/silver/core/silver__streamline_events.sql
index 707c1ac..341f15b 100644
--- a/models/silver/core/silver__streamline_events.sql
+++ b/models/silver/core/silver__streamline_events.sql
@@ -3,7 +3,8 @@
     unique_key = 'event_id',
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = "_inserted_timestamp::date",
+    cluster_by = "block_timestamp::date",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_id,event_id,event_contract,event_type);",
     tags = ['core', 'streamline_scheduled', 'scheduled', 'scheduled_core']
 ) }}
 
diff --git a/models/silver/core/silver__streamline_transactions_final.sql b/models/silver/core/silver__streamline_transactions_final.sql
index 7412789..9295568 100644
--- a/models/silver/core/silver__streamline_transactions_final.sql
+++ b/models/silver/core/silver__streamline_transactions_final.sql
@@ -4,7 +4,8 @@
     unique_key = "tx_id",
     incremental_strategy = 'merge',
     merge_exclude_columns = ["inserted_timestamp"],
-    cluster_by = "_inserted_timestamp::date",
+    cluster_by = "block_timestamp::date",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_id,proposer,payer,authorizers);",
     tags = ['core', 'streamline_scheduled', 'scheduled', 'scheduled_core']
 ) }}
 
diff --git a/models/silver/defi/silver__swaps_final.sql b/models/silver/defi/silver__swaps_final.sql
index 61fda66..d367813 100644
--- a/models/silver/defi/silver__swaps_final.sql
+++ b/models/silver/defi/silver__swaps_final.sql
@@ -4,6 +4,7 @@
     merge_exclude_columns = ["inserted_timestamp"],
     cluster_by = ['block_timestamp::DATE'],
     unique_key = 'swaps_final_id',
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_id,trader);",
     tags = ['scheduled_non_core']
 ) }}
 
diff --git a/models/silver/nft/metadata/livequery/topshot/silver__nft_topshot_metadata.sql b/models/silver/nft/metadata/livequery/topshot/silver__nft_topshot_metadata.sql
index 154d8a3..fdf12b2 100644
--- a/models/silver/nft/metadata/livequery/topshot/silver__nft_topshot_metadata.sql
+++ b/models/silver/nft/metadata/livequery/topshot/silver__nft_topshot_metadata.sql
@@ -4,6 +4,7 @@
     cluster_by = ['_inserted_timestamp::DATE'],
     unique_key = 'nft_id',
     tags = ['livequery'],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(nft_id,nbatopshot_id);",
     full_refresh = False
 ) }}
 {# NFT Metadata from legacy process lives in external table, deleted CTE and set FR=False 
diff --git a/models/silver/nft/metadata/silver__nft_ufc_strike_metadata.sql b/models/silver/nft/metadata/silver__nft_ufc_strike_metadata.sql
index 79427a9..440c488 100644
--- a/models/silver/nft/metadata/silver__nft_ufc_strike_metadata.sql
+++ b/models/silver/nft/metadata/silver__nft_ufc_strike_metadata.sql
@@ -3,6 +3,7 @@
     incremental_strategy = 'merge',
     unique_key = ['nft_id'],
     merge_exclude_columns = ["inserted_timestamp"],
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(nft_id);",
     tags = ['scheduled_non_core']
 ) }}
 
diff --git a/models/silver/nft/silver__nft_allday_metadata_s.sql b/models/silver/nft/silver__nft_allday_metadata_s.sql
index 75b94e9..c958df1 100644
--- a/models/silver/nft/silver__nft_allday_metadata_s.sql
+++ b/models/silver/nft/silver__nft_allday_metadata_s.sql
@@ -4,6 +4,7 @@
     cluster_by = ['_inserted_timestamp::DATE'],
     merge_exclude_columns = ["inserted_timestamp"],
     unique_key = 'nft_allday_metadata_s_id',
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(nft_id,nflallday_id);",
     tags = ['nft']
 ) }}
 
diff --git a/models/silver/nft/silver__nft_sales_s.sql b/models/silver/nft/silver__nft_sales_s.sql
index 78752fa..8656928 100644
--- a/models/silver/nft/silver__nft_sales_s.sql
+++ b/models/silver/nft/silver__nft_sales_s.sql
@@ -1,8 +1,9 @@
 {{ config(
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
-    cluster_by = ['_inserted_timestamp::DATE'],
+    cluster_by = ['block_timestamp::DATE'],
     unique_key = 'tx_id',
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_id,nft_id,buyer,seller);",
     tags = ['nft', 'scheduled', 'streamline_scheduled', 'scheduled_non_core']
 ) }}
 
diff --git a/models/silver/prices/silver__complete_native_prices.sql b/models/silver/prices/silver__complete_native_prices.sql
index a88ed8d..5df4e9b 100644
--- a/models/silver/prices/silver__complete_native_prices.sql
+++ b/models/silver/prices/silver__complete_native_prices.sql
@@ -2,6 +2,7 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = 'complete_native_prices_id',
+    cluster_by = ['HOUR::DATE'],
     tags = ['scheduled_non_core']
 ) }}
 
diff --git a/models/silver/prices/silver__complete_provider_prices.sql b/models/silver/prices/silver__complete_provider_prices.sql
index 0fd6576..ecc9992 100644
--- a/models/silver/prices/silver__complete_provider_prices.sql
+++ b/models/silver/prices/silver__complete_provider_prices.sql
@@ -2,6 +2,7 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = 'complete_provider_prices_id',
+    cluster_by = ['HOUR::DATE'],
     tags = ['scheduled_non_core']
 ) }}
 
diff --git a/models/silver/prices/silver__complete_token_prices.sql b/models/silver/prices/silver__complete_token_prices.sql
index ac0d472..54ed860 100644
--- a/models/silver/prices/silver__complete_token_prices.sql
+++ b/models/silver/prices/silver__complete_token_prices.sql
@@ -2,6 +2,7 @@
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
     unique_key = 'complete_token_prices_id',
+    cluster_by = ['HOUR::DATE'],
     tags = ['scheduled_non_core']
 ) }}
 
diff --git a/models/silver/staking/silver__staking_actions_s.sql b/models/silver/staking/silver__staking_actions_s.sql
index b3f5892..a94a3f2 100644
--- a/models/silver/staking/silver__staking_actions_s.sql
+++ b/models/silver/staking/silver__staking_actions_s.sql
@@ -1,8 +1,9 @@
 {{ config(
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
-    cluster_by = ['_inserted_timestamp::DATE'],
+    cluster_by = ['block_timestamp::DATE'],
     unique_key = 'tx_id',
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_id,delegator);",
     tags = ['scheduled', 'streamline_scheduled', 'scheduled_non_core']
 ) }}
 
diff --git a/models/silver/transfers/silver__token_transfers_s.sql b/models/silver/transfers/silver__token_transfers_s.sql
index ace4ffd..b88a169 100644
--- a/models/silver/transfers/silver__token_transfers_s.sql
+++ b/models/silver/transfers/silver__token_transfers_s.sql
@@ -1,8 +1,9 @@
 {{ config(
     materialized = 'incremental',
     incremental_strategy = 'delete+insert',
-    cluster_by = ['_inserted_timestamp::date'],
+    cluster_by = ['block_timestamp::date'],
     unique_key = "CONCAT_WS('-', tx_id, sender, recipient, token_contract, amount)",
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION ON EQUALITY(tx_id,sender,recipient,token_contract);",
     tags = ['scheduled', 'streamline_scheduled', 'scheduled_non_core']
 ) }}