diff --git a/library/server/wsf/router/support/execute/helpers/wsf_execute_filter_handler.e b/library/server/wsf/router/support/execute/helpers/wsf_execute_filter_handler.e
index 53678008..16be7d7f 100644
--- a/library/server/wsf/router/support/execute/helpers/wsf_execute_filter_handler.e
+++ b/library/server/wsf/router/support/execute/helpers/wsf_execute_filter_handler.e
@@ -1,8 +1,11 @@
 note
-	description : "Objects that ..."
-	author      : "$Author$"
-	date        : "$Date$"
-	revision    : "$Revision$"
+	description: "[
+				Handler that can also play the role of a filter, i.e.
+				than can pre-process incoming data and post-process outgoing data.
+		]"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	WSF_EXECUTE_FILTER_HANDLER
@@ -22,7 +25,7 @@ feature -- Execution
 		end
 
 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2017, 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/server/wsf/router/support/uri/helpers/wsf_uri_filter_handler.e b/library/server/wsf/router/support/uri/helpers/wsf_uri_filter_handler.e
index ab2d7f4e..dc16e5b7 100644
--- a/library/server/wsf/router/support/uri/helpers/wsf_uri_filter_handler.e
+++ b/library/server/wsf/router/support/uri/helpers/wsf_uri_filter_handler.e
@@ -8,10 +8,19 @@ deferred class
 	WSF_URI_FILTER_HANDLER
 
 inherit
-	WSF_EXECUTE_FILTER_HANDLER
+	WSF_FILTER_HANDLER [WSF_URI_HANDLER]
 
 	WSF_URI_HANDLER
 
+feature -- Execution
+
+	execute_next (req: WSF_REQUEST; res: WSF_RESPONSE)
+		do
+			if attached next as n then
+				n.execute (req, res)
+			end
+		end
+
 note
 	copyright: "2011-2017, 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)"
diff --git a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e
index c28005db..02b6111f 100644
--- a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e
+++ b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e
@@ -8,10 +8,19 @@ deferred class
 	WSF_URI_TEMPLATE_FILTER_HANDLER
 
 inherit
-	WSF_EXECUTE_FILTER_HANDLER
+	WSF_FILTER_HANDLER [WSF_URI_TEMPLATE_HANDLER]
 
 	WSF_URI_TEMPLATE_HANDLER
 
+feature -- Execution
+
+	execute_next (req: WSF_REQUEST; res: WSF_RESPONSE)
+		do
+			if attached next as n then
+				n.execute (req, res)
+			end
+		end
+
 note
 	copyright: "2011-2017, 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)"