diff --git a/sros2/sros2/policy/templates/dds/demangle.xsl b/sros2/sros2/policy/templates/dds/demangle.xsl
index 7d2e8b39..db800975 100644
--- a/sros2/sros2/policy/templates/dds/demangle.xsl
+++ b/sros2/sros2/policy/templates/dds/demangle.xsl
@@ -117,7 +117,7 @@
@reply, '|',
@request)"/>
@@ -133,7 +133,7 @@
@request)))]"/>
@@ -142,9 +142,9 @@
+ following-sibling::actions[@call = current()/@call]/node() " />
+ following-sibling::actions[@execute = current()/@execute]/node() " />
@@ -160,9 +160,9 @@
+ following-sibling::topics[@publish = current()/@publish]/node() " />
+ following-sibling::topics[@subscribe = current()/@subscribe]/node() " />