diff --git a/scheme/httpd/surflets/addresses.scm b/scheme/httpd/surflets/addresses.scm
index 4f68406..68d6cb8 100644
--- a/scheme/httpd/surflets/addresses.scm
+++ b/scheme/httpd/surflets/addresses.scm
@@ -55,7 +55,7 @@
 	     (<= (length annotation) 1))
 	(let ((index (if (null? annotation)
 			 (address-add-annotation! address "")
-			 (address-add-annotation! address (car annotation)))))
+			 (address-add-annotation! address (escape-uri (car annotation))))))
 	  (string-append message "?" (address-name address)
 			 "=" index)))
        ((eq? message 'address)