diff --git a/src/common/meta/dashboards/v3/mod.rs b/src/common/meta/dashboards/v3/mod.rs
index 137d238a0c..cad146895b 100644
--- a/src/common/meta/dashboards/v3/mod.rs
+++ b/src/common/meta/dashboards/v3/mod.rs
@@ -146,7 +146,7 @@ pub enum AggregationFunc {
     P50,
     P90,
     P95,
-    P99
+    P99,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ToSchema)]
diff --git a/src/config/src/config.rs b/src/config/src/config.rs
index 1f0d8ac913..f03a149edd 100644
--- a/src/config/src/config.rs
+++ b/src/config/src/config.rs
@@ -784,7 +784,7 @@ pub struct Limit {
     pub distinct_values_interval: u64,
     #[env_config(name = "ZO_DISTINCT_VALUES_HOURLY", default = false)]
     pub distinct_values_hourly: bool,
-    #[env_config(name = "ZO_CONSISTENT_HASH_VNODES", default = 3)]
+    #[env_config(name = "ZO_CONSISTENT_HASH_VNODES", default = 16)]
     pub consistent_hash_vnodes: usize,
     #[env_config(name = "ZO_DATAFUSION_FILE_STAT_CACHE_MAX_ENTRIES", default = 100000)]
     pub datafusion_file_stat_cache_max_entries: usize,
@@ -949,6 +949,8 @@ pub struct Nats {
     pub password: String,
     #[env_config(name = "ZO_NATS_REPLICAS", default = 3)]
     pub replicas: usize,
+    #[env_config(name = "ZO_NATS_HISTORY", default = 3)]
+    pub history: i64,
     #[env_config(name = "ZO_NATS_CONNECT_TIMEOUT", default = 5)]
     pub connect_timeout: u64,
     #[env_config(name = "ZO_NATS_COMMAND_TIMEOUT", default = 10)]
diff --git a/src/infra/src/db/nats.rs b/src/infra/src/db/nats.rs
index 972f6e4764..64ed9505d6 100644
--- a/src/infra/src/db/nats.rs
+++ b/src/infra/src/db/nats.rs
@@ -58,7 +58,7 @@ async fn get_bucket_by_key<'a>(
     let mut bucket = jetstream::kv::Config {
         bucket: format!("{}{}", prefix, bucket_name),
         num_replicas: cfg.nats.replicas,
-        history: 3,
+        history: cfg.nats.history,
         ..Default::default()
     };
     if bucket_name == "nodes" || bucket_name == "clusters" {
diff --git a/src/service/search/sql.rs b/src/service/search/sql.rs
index 5359dd60cb..0f9b3aec74 100644
--- a/src/service/search/sql.rs
+++ b/src/service/search/sql.rs
@@ -339,7 +339,7 @@ impl Sql {
         if meta.limit == 0 {
             meta.offset = req_query.from as usize;
             meta.limit = req_query.size as usize;
-            if meta.limit == 0 && sql_mode.eq(&SqlMode::Full) {
+            if meta.limit == 0 && sql_mode.eq(&SqlMode::Full) && !track_total_hits {
                 // sql mode context, allow limit 0, used to no hits, but return aggs
                 // sql mode full, disallow without limit, default limit 1000
                 meta.limit = cfg.limit.query_full_mode_limit;