diff --git a/class.html.twig b/class.html.twig
index 278656c..d853668 100644
--- a/class.html.twig
+++ b/class.html.twig
@@ -218,7 +218,15 @@
                         <dt>See also</dt>
                             {% endif %}
                             {% for tag in tags %}
-                            <dd><a href="{{ tag.link }}"><div class="namespace-wrapper">{{ tag.description }}</div></a></dd>
+                            <dd><a href="{{ tag.link }}"><div class="namespace-wrapper">{{ tag.reference|route|raw }}{% if tag.description %} {{ tag.description }}{% endif %}</div></a></dd>
+                            {% endfor %}
+                        {% endfor %}
+                        {% for tagName,tags in node.tags if tagName in ['uses'] %}
+                            {% if loop.first %}
+                        <dt>Uses</dt>
+                            {% endif %}
+                            {% for tag in tags %}
+                            <dd><a href="{{ tag.reference|route('url') }}"><div class="namespace-wrapper">{{ tag.reference|route|raw }}{% if tag.description %} {{ tag.description }}{% endif %}</div></a></dd>
                             {% endfor %}
                         {% endfor %}
 
@@ -227,7 +235,7 @@
                     </dl>
                     <h2>Tags</h2>
                     <table class="table table-condensed">
-                    {% for tagName,tags in node.tags if tagName not in ['link', 'see', 'abstract', 'method', 'property', 'property-read', 'property-write', 'package', 'subpackage'] %}
+                    {% for tagName,tags in node.tags if tagName not in ['link', 'see', 'abstract', 'method', 'property', 'property-read', 'property-write', 'package', 'subpackage', 'uses'] %}
                         <tr>
                             <th>
                                 {{ tagName }}
diff --git a/elements/method.html.twig b/elements/method.html.twig
index 5cc5036..d168eba 100644
--- a/elements/method.html.twig
+++ b/elements/method.html.twig
@@ -76,7 +76,7 @@
                         <dt>See also</dt>
                     {% endif %}
                     {% for tag in tags %}
-                        <dd><a href="{{ (tag.reference|route('url')) ?: tag.link }}"><span class="namespace-wrapper">{{ tag.description }}</span></a></dd>
+                        <dd><a href="{{ (tag.reference|route('url')) ?: tag.link }}"><span class="namespace-wrapper">{{ tag.reference|route|raw }}{% if tag.description %} {{ tag.description }}{% endif %}</span></a></dd>
                     {% endfor %}
                 {% endfor %}
                 {% for tagName,tags in method.tags if tagName in ['uses'] %}
@@ -84,7 +84,7 @@
                         <dt>Uses</dt>
                     {% endif %}
                     {% for tag in tags %}
-                        <dd>{{ tag.reference|route|raw }}</dd>
+                        <dd><a href="{{ tag.reference|route('url') }}"><span class="namespace-wrapper">{{ tag.reference|route|raw }}{% if tag.description %} {{ tag.description }}{% endif %}</span></a></dd>
                     {% endfor %}
                 {% endfor %}
             </dl>