diff --git a/library/server/wsf/router/uri_template/wsf_uri_template_handler_context.e b/library/server/wsf/router/uri_template/wsf_uri_template_handler_context.e
index d5a0799c..49ec16de 100644
--- a/library/server/wsf/router/uri_template/wsf_uri_template_handler_context.e
+++ b/library/server/wsf/router/uri_template/wsf_uri_template_handler_context.e
@@ -9,7 +9,7 @@ note
 
 				In addition to what WSF_HANDLER_CONTEXT already provides, i.e:
 				 	- request: WSF_REQUEST -- Associated request
-					- path: READABLE_STRING_8	-- Associated path				
+					- path: READABLE_STRING_8	-- Associated path
 
 			]"
 	date: "$Date$"
@@ -46,11 +46,11 @@ feature -- Access
 
 feature -- Item
 
-	item (a_name: READABLE_STRING_8): detachable WSF_VALUE
+	item (a_name: READABLE_STRING_32): detachable WSF_VALUE
 			-- Variable value for parameter or variable `a_name'
 			-- See `{WSF_REQUEST}.item(s)'
 		do
-			Result := path_parameter (a_name)
+			Result := path_parameter (a_name.as_string_8) --| Should we handle url-encoded name?
 			if Result = Void then
 				Result := request.item (a_name)
 			end
diff --git a/library/server/wsf/router/wsf_handler_context.e b/library/server/wsf/router/wsf_handler_context.e
index ed0e8009..dc2ef56a 100644
--- a/library/server/wsf/router/wsf_handler_context.e
+++ b/library/server/wsf/router/wsf_handler_context.e
@@ -111,7 +111,7 @@ feature -- Query
 
 feature -- Item
 
-	item (a_name: READABLE_STRING_8): detachable WSF_VALUE
+	item (a_name: READABLE_STRING_32): detachable WSF_VALUE
 			-- Variable value for parameter or variable `a_name'
 			-- See `{WSF_REQUEST}.item(s)'
 		deferred
diff --git a/library/server/wsf/src/wsf_request.e b/library/server/wsf/src/wsf_request.e
index 89af759d..15f8bbeb 100644
--- a/library/server/wsf/src/wsf_request.e
+++ b/library/server/wsf/src/wsf_request.e
@@ -239,7 +239,7 @@ feature -- Access: global variable
 			Result := items_table
 		end
 
-	item (a_name: READABLE_STRING_8): detachable WSF_VALUE
+	item (a_name: READABLE_STRING_32): detachable WSF_VALUE
 			-- Variable named `a_name' from any of the variables container
 			-- and following a specific order
 			-- execution, environment, get, post, cookies
@@ -842,7 +842,7 @@ feature -- Cookies
 			Result := cookies_table
 		end
 
-	cookie (a_name: READABLE_STRING_8): detachable WSF_VALUE
+	cookie (a_name: READABLE_STRING_32): detachable WSF_VALUE
 			-- Field for name `a_name'.
 		do
 			Result := cookies_table.item (a_name)
@@ -1078,7 +1078,7 @@ feature -- Form fields and related
 			Result := form_parameters_table
 		end
 
-	form_parameter (a_name: READABLE_STRING_8): detachable WSF_VALUE
+	form_parameter (a_name: READABLE_STRING_32): detachable WSF_VALUE
 			-- Field for name `a_name'.
 		do
 			Result := form_parameters_table.item (a_name)