diff --git a/crates/dkdc-db-core/src/catalog.rs b/crates/dkdc-db-core/src/catalog.rs
index 166b66c..9643749 100644
--- a/crates/dkdc-db-core/src/catalog.rs
+++ b/crates/dkdc-db-core/src/catalog.rs
@@ -229,7 +229,8 @@ fn extract_name_token(s: &str) -> Option<String> {
         if ch == '"' || ch == '`' || ch == '\'' {
             // Quoted segment: read until matching close quote
             let quote = ch;
-            result.push(chars.next().unwrap());
+            chars.next(); // consume the opening quote (peeked above)
+            result.push(quote);
             loop {
                 let c = chars.next()?; // unclosed quote → None
                 result.push(c);
@@ -241,7 +242,8 @@ fn extract_name_token(s: &str) -> Option<String> {
             // End of name token
             break;
         } else {
-            result.push(chars.next().unwrap());
+            // Safe: peek() confirmed a char exists above
+            result.push(chars.next().expect("peeked char"));
         }
     }
 
diff --git a/crates/dkdc-db-server/src/ui.rs b/crates/dkdc-db-server/src/ui.rs
index 5f63005..a1cdb67 100644
--- a/crates/dkdc-db-server/src/ui.rs
+++ b/crates/dkdc-db-server/src/ui.rs
@@ -888,7 +888,7 @@ async fn api_drop_db(State(mgr): State<AppState>, Path(name): Path<String>) -> R
             let mut response = Html(String::new()).into_response();
             response
                 .headers_mut()
-                .insert("HX-Redirect", "/ui".parse().unwrap());
+                .insert("HX-Redirect", axum::http::HeaderValue::from_static("/ui"));
             response
         }
         Err(e) => Html(format!(