diff --git a/Cargo.lock b/Cargo.lock
index de65356..fc8ea89 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.125"
+version = "0.1.126"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.125"
+version = "0.1.126"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.125"
+version = "0.1.126"
 dependencies = [
  "chrono",
  "serde",
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
index 7223d30..4a49606 100644
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.125"
+version = "0.1.126"
 edition = "2021"
 
 [dependencies]
diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml
index f8f4642..9a42cdb 100644
--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.125"
+version = "0.1.126"
 edition = "2021"
 
 [dependencies]
diff --git a/dashboard/src/ui/widgets/system.rs b/dashboard/src/ui/widgets/system.rs
index 35f23fe..4206069 100644
--- a/dashboard/src/ui/widgets/system.rs
+++ b/dashboard/src/ui/widgets/system.rs
@@ -351,39 +351,33 @@ impl SystemWidget {
         // Pattern: disk_{pool_name}_{various suffixes}
         // Since pool_name can contain underscores, work backwards from known metric suffixes
         if metric_name.starts_with("disk_") {
-            // Handle filesystem metrics: disk_{pool}_fs_{filesystem}_{metric}
+            // Handle filesystem metrics: disk_{pool}_fs_{filesystem}_{metric} 
             if metric_name.contains("_fs_") {
                 if let Some(fs_pos) = metric_name.find("_fs_") {
                     return Some(metric_name[5..fs_pos].to_string()); // Skip "disk_", extract pool name before "_fs_"
                 }
             }
+            
             // Handle pool-level metrics (usage_percent, used_gb, total_gb, mount_point, pool_type, pool_health)
-            else if let Some(suffix_pos) = metric_name.rfind("_usage_percent")
-                .or_else(|| metric_name.rfind("_used_gb"))
-                .or_else(|| metric_name.rfind("_total_gb"))
-                .or_else(|| metric_name.rfind("_available_gb"))
-                .or_else(|| metric_name.rfind("_mount_point"))
-                .or_else(|| metric_name.rfind("_pool_type"))
-                .or_else(|| metric_name.rfind("_pool_health")) {
-                return Some(metric_name[5..suffix_pos].to_string()); // Skip "disk_"
-            }
-            // Handle drive-specific metrics: disk_{pool}_{drive}_{metric}
-            else if let Some(suffix_pos) = metric_name.rfind("_temperature")
-                .or_else(|| metric_name.rfind("_wear_percent"))
-                .or_else(|| metric_name.rfind("_health")) {
-                // For both mergerfs and physical drives: disk_{pool_name}_{drive_name}_{metric}
-                // Extract pool name by finding the second-to-last underscore
-                let before_suffix = &metric_name[..suffix_pos];
-                if let Some(drive_start) = before_suffix.rfind('_') {
-                    if drive_start > 5 {
-                        return Some(metric_name[5..drive_start].to_string()); // Skip "disk_"
-                    }
+            // Use rfind to get the last occurrence of these suffixes
+            let pool_suffixes = ["_usage_percent", "_used_gb", "_total_gb", "_available_gb", "_mount_point", "_pool_type", "_pool_health"];
+            for suffix in pool_suffixes {
+                if let Some(suffix_pos) = metric_name.rfind(suffix) {
+                    return Some(metric_name[5..suffix_pos].to_string()); // Skip "disk_"
                 }
             }
-            // Fallback: extract first component after disk_ prefix
-            else if let Some(captures) = metric_name.strip_prefix("disk_") {
-                if let Some(pos) = captures.find('_') {
-                    return Some(captures[..pos].to_string());
+            
+            // Handle drive-specific metrics: disk_{pool}_{drive}_{metric}
+            let drive_suffixes = ["_temperature", "_wear_percent", "_health"];
+            for suffix in drive_suffixes {
+                if let Some(suffix_pos) = metric_name.rfind(suffix) {
+                    // Extract pool name by finding the second-to-last underscore
+                    let before_suffix = &metric_name[..suffix_pos];
+                    if let Some(drive_start) = before_suffix.rfind('_') {
+                        if drive_start > 5 {
+                            return Some(metric_name[5..drive_start].to_string()); // Skip "disk_"
+                        }
+                    }
                 }
             }
         }
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 9454e2f..22ba150 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.125"
+version = "0.1.126"
 edition = "2021"
 
 [dependencies]