diff --git a/src-tauri/src/db/postgres.rs b/src-tauri/src/db/postgres.rs
index 6dcef76cd6..6c90481de7 100644
--- a/src-tauri/src/db/postgres.rs
+++ b/src-tauri/src/db/postgres.rs
@@ -305,10 +305,11 @@ pub async fn list_indexes(pool: &PgPool, schema: &str, table: &str) -> Result<Ve
         .map(|row| {
             let all_cols: Vec<String> = row.get::<Vec<String>, _>("columns");
             let nkeyatts = row.get::<Option<i16>, _>("nkeyatts").unwrap_or(all_cols.len() as i16) as usize;
+            let key_cols = all_cols[..nkeyatts].to_vec();
             let included = if nkeyatts < all_cols.len() { all_cols[nkeyatts..].to_vec() } else { vec![] };
             IndexInfo {
                 name: row.get::<String, _>("index_name"),
-                columns: all_cols,
+                columns: key_cols,
                 is_unique: row.get::<bool, _>("is_unique"),
                 is_primary: row.get::<bool, _>("is_primary"),
                 filter: row.get::<Option<String>, _>("filter_expr"),
diff --git a/src-tauri/src/db/sqlserver.rs b/src-tauri/src/db/sqlserver.rs
index 47d54c0bfe..bcc03092a0 100644
--- a/src-tauri/src/db/sqlserver.rs
+++ b/src-tauri/src/db/sqlserver.rs
@@ -125,7 +125,12 @@ pub async fn get_columns(client: &mut SqlServerClient, schema: &str, table: &str
                 Some(n) => format!("nvarchar({n})"),
                 None => "nvarchar".to_string(),
             },
-            "char" | "nchar" | "binary" | "varbinary" => match max_len {
+            "varbinary" => match max_len {
+                Some(-1) => "varbinary(max)".to_string(),
+                Some(n) if n > 0 => format!("varbinary({n})"),
+                _ => "varbinary".to_string(),
+            },
+            "char" | "nchar" | "binary" => match max_len {
                 Some(n) if n > 0 => format!("{base}({n})"),
                 _ => base,
             }