diff --git a/library/server/wsf/src/wsf_request.e b/library/server/wsf/src/wsf_request.e
index 677f2a24..299cd912 100644
--- a/library/server/wsf/src/wsf_request.e
+++ b/library/server/wsf/src/wsf_request.e
@@ -1443,8 +1443,12 @@ feature {NONE} -- Query parameters: implementation
 							if j > 0 then
 								l_name := s.substring (1, j - 1)
 								l_value := s.substring (j + 1, s.count)
-								add_value_to_table (l_name, l_value, Result)
+							else
+									-- I.e variable without value
+								l_name := s
+								l_value := empty_string_8
 							end
+							add_value_to_table (l_name, l_value, Result)
 						end
 					end
 				end
@@ -2059,7 +2063,7 @@ invariant
 	wgi_request.content_type /= Void implies content_type /= Void
 
 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/text/parser/uri_template/src/uri_template.e b/library/text/parser/uri_template/src/uri_template.e
index 916bc0e8..a31c951f 100644
--- a/library/text/parser/uri_template/src/uri_template.e
+++ b/library/text/parser/uri_template/src/uri_template.e
@@ -464,8 +464,12 @@ feature {NONE} -- Implementation
 						if j > 0 then
 							l_name := s.substring (1, j - 1)
 							l_value := s.substring (j + 1, s.count)
-							res.force (l_value, l_name)
+						else
+								-- variable without value
+							l_name := s
+							create {IMMUTABLE_STRING_8} l_value.make_empty
 						end
+						res.force (l_value, l_name)
 					end
 				end
 			end