diff --git a/lib/web/doctreeclient/client.v b/lib/web/doctreeclient/client.v
index 304b9dd0..74ab6856 100644
--- a/lib/web/doctreeclient/client.v
+++ b/lib/web/doctreeclient/client.v
@@ -1,6 +1,7 @@
 module doctreeclient
 
 import freeflowuniverse.herolib.core.pathlib
+import freeflowuniverse.herolib.core.texttools
 import os
 
 // List of recognized image file extensions
@@ -16,13 +17,17 @@ pub enum DocTreeError {
 
 // get_page_path returns the path for a page in a collection
 pub fn (mut c DocTreeClient) get_page_path(collection_name string, page_name string) !string {
+	// Apply name_fix to collection and page names
+	fixed_collection_name := texttools.name_fix(collection_name)
+	fixed_page_name := texttools.name_fix(page_name)
+	
 	// Check if the collection exists
-	collection_path := c.redis.hget('doctree:path', collection_name) or {
+	collection_path := c.redis.hget('doctree:path', fixed_collection_name) or {
 		return error('${DocTreeError.collection_not_found}: Collection "${collection_name}" not found')
 	}
 	
 	// Get the relative path of the page within the collection
-	rel_path := c.redis.hget('doctree:${collection_name}', page_name) or {
+	rel_path := c.redis.hget('doctree:${fixed_collection_name}', fixed_page_name) or {
 		return error('${DocTreeError.page_not_found}: Page "${page_name}" not found in collection "${collection_name}"')
 	}
 	
@@ -32,13 +37,17 @@ pub fn (mut c DocTreeClient) get_page_path(collection_name string, page_name str
 
 // get_file_path returns the path for a file in a collection
 pub fn (mut c DocTreeClient) get_file_path(collection_name string, file_name string) !string {
+	// Apply name_fix to collection and file names
+	fixed_collection_name := texttools.name_fix(collection_name)
+	fixed_file_name := texttools.name_fix(file_name)
+	
 	// Check if the collection exists
-	collection_path := c.redis.hget('doctree:path', collection_name) or {
+	collection_path := c.redis.hget('doctree:path', fixed_collection_name) or {
 		return error('${DocTreeError.collection_not_found}: Collection "${collection_name}" not found')
 	}
 	
 	// Get the relative path of the file within the collection
-	rel_path := c.redis.hget('doctree:${collection_name}', file_name) or {
+	rel_path := c.redis.hget('doctree:${fixed_collection_name}', fixed_file_name) or {
 		return error('${DocTreeError.file_not_found}: File "${file_name}" not found in collection "${collection_name}"')
 	}
 	
@@ -48,13 +57,17 @@ pub fn (mut c DocTreeClient) get_file_path(collection_name string, file_name str
 
 // get_image_path returns the path for an image in a collection
 pub fn (mut c DocTreeClient) get_image_path(collection_name string, image_name string) !string {
+	// Apply name_fix to collection and image names
+	fixed_collection_name := texttools.name_fix(collection_name)
+	fixed_image_name := texttools.name_fix(image_name)
+	
 	// Check if the collection exists
-	collection_path := c.redis.hget('doctree:path', collection_name) or {
+	collection_path := c.redis.hget('doctree:path', fixed_collection_name) or {
 		return error('${DocTreeError.collection_not_found}: Collection "${collection_name}" not found')
 	}
 	
 	// Get the relative path of the image within the collection
-	rel_path := c.redis.hget('doctree:${collection_name}', image_name) or {
+	rel_path := c.redis.hget('doctree:${fixed_collection_name}', fixed_image_name) or {
 		return error('${DocTreeError.image_not_found}: Image "${image_name}" not found in collection "${collection_name}"')
 	}
 	
@@ -64,51 +77,66 @@ pub fn (mut c DocTreeClient) get_image_path(collection_name string, image_name s
 
 // page_exists checks if a page exists in a collection
 pub fn (mut c DocTreeClient) page_exists(collection_name string, page_name string) bool {
+	// Apply name_fix to collection and page names
+	fixed_collection_name := texttools.name_fix(collection_name)
+	fixed_page_name := texttools.name_fix(page_name)
+	
 	// Check if the collection exists
-	e:=c.redis.hexists('doctree:path', collection_name) or {
+	e := c.redis.hexists('doctree:path', fixed_collection_name) or {
 		return false
 	}
-	if !e{
+	if !e {
 		return false
 	}
 	
 	// Check if the page exists in the collection
-	return c.redis.hexists('doctree:${collection_name}', page_name) or {false}
+	return c.redis.hexists('doctree:${fixed_collection_name}', fixed_page_name) or {false}
 }
 
 // file_exists checks if a file exists in a collection
 pub fn (mut c DocTreeClient) file_exists(collection_name string, file_name string) bool {
-	// Check if the collection exists
-	e:=c.redis.hexists('doctree:path', collection_name) or {
-		return false
-	}
-	if !e{
-		return false
-	}
+	// Apply name_fix to collection and file names
+	fixed_collection_name := texttools.name_fix(collection_name)
+	fixed_file_name := texttools.name_fix(file_name)
 	
+	// Check if the collection exists
+	e := c.redis.hexists('doctree:path', fixed_collection_name) or {
+		return false
+	}
+	if !e {
+		return false
+	}
 	
 	// Check if the file exists in the collection
-	return c.redis.hexists('doctree:${collection_name}', file_name) or {false}
+	return c.redis.hexists('doctree:${fixed_collection_name}', fixed_file_name) or {false}
 }
 
 // image_exists checks if an image exists in a collection
 pub fn (mut c DocTreeClient) image_exists(collection_name string, image_name string) bool {
+	// Apply name_fix to collection and image names
+	fixed_collection_name := texttools.name_fix(collection_name)
+	fixed_image_name := texttools.name_fix(image_name)
+	
 	// Check if the collection exists
-	e:=c.redis.hexists('doctree:path', collection_name) or {
+	e := c.redis.hexists('doctree:path', fixed_collection_name) or {
 		return false
 	}
-	if !e{
+	if !e {
 		return false
 	}
 	
 	// Check if the image exists in the collection
-	return c.redis.hexists('doctree:${collection_name}', image_name) or {false}
+	return c.redis.hexists('doctree:${fixed_collection_name}', fixed_image_name) or {false}
 }
 
 // get_page_content returns the content of a page in a collection
 pub fn (mut c DocTreeClient) get_page_content(collection_name string, page_name string) !string {
+	// Apply name_fix to collection and page names
+	fixed_collection_name := texttools.name_fix(collection_name)
+	fixed_page_name := texttools.name_fix(page_name)
+	
 	// Get the path for the page
-	page_path := c.get_page_path(collection_name, page_name)!
+	page_path := c.get_page_path(fixed_collection_name, fixed_page_name)!
 	
 	// Use pathlib to read the file content
 	mut path := pathlib.get_file(path: page_path)!
@@ -130,13 +158,16 @@ pub fn (mut c DocTreeClient) list_collections() ![]string {
 
 // list_pages returns a list of all page names in a collection
 pub fn (mut c DocTreeClient) list_pages(collection_name string) ![]string {
+	// Apply name_fix to collection name
+	fixed_collection_name := texttools.name_fix(collection_name)
+	
 	// Check if the collection exists
-	if ! (c.redis.hexists('doctree:path', collection_name) or {false}) {
+	if ! (c.redis.hexists('doctree:path', fixed_collection_name) or {false}) {
 		return error('${DocTreeError.collection_not_found}: Collection "${collection_name}" not found')
 	}
 	
 	// Get all keys from the collection hash
-	all_keys := c.redis.hkeys('doctree:${collection_name}')!
+	all_keys := c.redis.hkeys('doctree:${fixed_collection_name}')!
 	
 	// Filter out only the page names (those without file extensions)
 	mut page_names := []string{}
@@ -151,19 +182,22 @@ pub fn (mut c DocTreeClient) list_pages(collection_name string) ![]string {
 
 // list_files returns a list of all file names in a collection
 pub fn (mut c DocTreeClient) list_files(collection_name string) ![]string {
+	// Apply name_fix to collection name
+	fixed_collection_name := texttools.name_fix(collection_name)
+	
 	// Check if the collection exists
-	if ! (c.redis.hexists('doctree:path', collection_name) or {false}) {
+	if ! (c.redis.hexists('doctree:path', fixed_collection_name) or {false}) {
 		return error('${DocTreeError.collection_not_found}: Collection "${collection_name}" not found')
 	}
 	
 	// Get all keys from the collection hash
-	all_keys := c.redis.hkeys('doctree:${collection_name}')!
+	all_keys := c.redis.hkeys('doctree:${fixed_collection_name}')!
 	
 	// Filter out only the file names (those with file extensions, but not images)
 	mut file_names := []string{}
 	for key in all_keys {
 		// Get the value (path) for this key
-		value := c.redis.hget('doctree:${collection_name}', key) or { continue }
+		value := c.redis.hget('doctree:${fixed_collection_name}', key) or { continue }
 		
 		// Check if the value contains a file extension (has a dot)
 		if value.contains('.') {
@@ -188,19 +222,22 @@ pub fn (mut c DocTreeClient) list_files(collection_name string) ![]string {
 
 // list_images returns a list of all image names in a collection
 pub fn (mut c DocTreeClient) list_images(collection_name string) ![]string {
+	// Apply name_fix to collection name
+	fixed_collection_name := texttools.name_fix(collection_name)
+	
 	// Check if the collection exists
-	if ! (c.redis.hexists('doctree:path', collection_name) or {false}) {
+	if ! (c.redis.hexists('doctree:path', fixed_collection_name) or {false}) {
 		return error('${DocTreeError.collection_not_found}: Collection "${collection_name}" not found')
 	}
 	
 	// Get all keys from the collection hash
-	all_keys := c.redis.hkeys('doctree:${collection_name}')!
+	all_keys := c.redis.hkeys('doctree:${fixed_collection_name}')!
 	
 	// Filter out only the image names (those whose values end with image extensions)
 	mut image_names := []string{}
 	for key in all_keys {
 		// Get the value (path) for this key
-		value := c.redis.hget('doctree:${collection_name}', key) or { continue }
+		value := c.redis.hget('doctree:${fixed_collection_name}', key) or { continue }
 		
 		// Check if the value ends with any of the image extensions
 		for ext in image_extensions {