diff -r b174e721663e -r 6d0da97105d8 libidav/utils.c
--- a/libidav/utils.c	Sat Dec 27 22:47:56 2025 +0100
+++ b/libidav/utils.c	Thu Jan 08 18:06:04 2026 +0100
@@ -460,7 +460,7 @@
     }
     cxmutstr value_cp = cx_strdup(cx_strtrim(value));
         
-    cxMapPut(map, cx_hash_key(key_cp.ptr, key_cp.length), value_cp.ptr);
+    cxMapPut(map, key_cp, value_cp.ptr);
     
     free(key_cp.ptr);
     
@@ -743,9 +743,9 @@
     
     cxmutstr url;
     if(add_separator) {
-        url = cx_strcat(3, base, cx_str("/"), path);
+        url = cx_strcat(CX_NULLSTR, 3, base, cx_str("/"), path);
     } else {
-        url = cx_strcat(2, base, path);
+        url = cx_strcat(CX_NULLSTR, 2, base, path);
     }
     
     return url;
@@ -769,9 +769,9 @@
 
     cxmutstr url;
     if(add_separator) {
-        url = cx_strcat(3, base, cx_strn(&separator, 1), path);
+        url = cx_strcat(CX_NULLSTR, 3, base, cx_strn(&separator, 1), path);
     } else {
-        url = cx_strcat(2, base, path);
+        url = cx_strcat(CX_NULLSTR, 2, base, path);
     }
 
     return url;
@@ -792,7 +792,7 @@
     const char *base_path = util_url_path(sn->base_url);
     base.length -= strlen(base_path);
     
-    cxmutstr url = cx_strcat(2, base, href_str);
+    cxmutstr url = cx_strcat(CX_NULLSTR, 2, base, href_str);
     return url.ptr;
 }