diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index 5a20bdc120..1eb09a52e3 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -516,11 +516,13 @@ def document_main(request, name, rev=None, document_html=False):
         # Do not show the Auth48 URL in the "Additional URLs" section
         additional_urls = doc.documenturl_set.exclude(tag_id='auth48')
 
-        # Stream description passing test
+        # Stream description and name passing test
         if doc.stream != None:
             stream_desc = doc.stream.desc
+            stream = "draft-stream-" + doc.stream.slug
         else:
             stream_desc = "(None)"
+            stream = "(None)"
 
         html = None
         js = None
@@ -557,6 +559,7 @@ def document_main(request, name, rev=None, document_html=False):
                                        split_content=split_content,
                                        revisions=simple_diff_revisions if document_html else revisions,
                                        snapshot=snapshot,
+                                       stream=stream,
                                        stream_desc=stream_desc,
                                        latest_revision=latest_revision,
                                        latest_rev=latest_rev,
diff --git a/ietf/doc/views_help.py b/ietf/doc/views_help.py
index fd46bda310..73cdcdd20f 100644
--- a/ietf/doc/views_help.py
+++ b/ietf/doc/views_help.py
@@ -7,12 +7,13 @@
 from ietf.name.models import DocRelationshipName,  DocTagName
 from ietf.doc.utils import get_tags_for_stream_id
 
-# TODO: This is haphazardly implemented. Either flesh it out or reconsider the utility of showing these in these this way.
-def state_help(request, type):
+def state_help(request, type=None):
     slug, title = {
         "draft-iesg": ("draft-iesg", "IESG States for Internet-Drafts"),
         "draft-rfceditor": ("draft-rfceditor", "RFC Editor States for Internet-Drafts"),
         "draft-iana-action": ("draft-iana-action", "IANA Action States for Internet-Drafts"),
+        "draft-iana-review": ("draft-iana-review", "IANA Review States for Internet-Drafts"),
+        "draft-iana-experts": ("draft-iana-experts", "IANA Expert Review States for Internet-Drafts"),
         "draft-stream-ietf": ("draft-stream-ietf", "IETF Stream States for Internet-Drafts"),
         "draft-stream-irtf": ("draft-stream-irtf", "IRTF Stream States for Internet-Drafts"),
         "draft-stream-ise": ("draft-stream-ise", "ISE Stream States for Internet-Drafts"),
@@ -26,7 +27,7 @@ def state_help(request, type):
         }.get(type, (None, None))
     state_type = get_object_or_404(StateType, slug=slug)
 
-    states = State.objects.filter(type=state_type).order_by("order")
+    states = State.objects.filter(used=True, type=state_type).order_by("order")
 
     has_next_states = False
     for state in states:
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index dd1793dca2..9cc054691e 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -47,7 +47,7 @@
                 {% if doc.stream %}
                     <th scope="row">
                         {% if doc.stream.slug != "legacy" %}
-                            <a href="{% url "ietf.help.views.state" doc=doc.type.slug type=doc.stream.slug %}">
+                            <a href="{% url "ietf.doc.views_help.state_help" type=stream %}">
                                 {% if doc.stream_id == 'ietf' %}
                                     WG
                                 {% else %}
@@ -274,7 +274,7 @@
                         IESG
                     </th>
                     <th scope="row">
-                        <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">
+                        <a href="{% url "ietf.doc.views_help.state_help" type="draft-iesg" %}">
                             IESG state
                         </a>
                     </th>
@@ -468,7 +468,7 @@
                                 IANA
                             </th>
                             <th scope="row">
-                                <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">
+                                <a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-review" %}">
                                     IANA review state
                                 </a>
                             </th>
@@ -497,7 +497,7 @@
                                 {% if not can_edit_iana_state and not iana_review_state %}IANA{% endif %}
                             </th>
                             <th scope="row">
-                                <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-action" %}">
+                                <a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-action" %}">
                                     IANA action state
                                 </a>
                             </th>
@@ -526,7 +526,7 @@
                                 {% if not can_edit_iana_state and not iana_review_state and not iana_action_state %}IANA{% endif %}
                             </th>
                             <th scope="row">
-                                <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-experts" %}">
+                                <a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-experts" %}">
                                     IANA expert review state
                                 </a>
                             </th>
@@ -587,7 +587,7 @@
                             RFC Editor
                         </th>
                         <th scope="row">
-                            <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">
+                            <a href="{% url "ietf.doc.views_help.state_help" type="draft-rfceditor" %}">
                                 RFC Editor state
                             </a>
                         </th>
diff --git a/ietf/templates/doc/state_help.html b/ietf/templates/doc/state_help.html
index d7678987ac..34481b7863 100644
--- a/ietf/templates/doc/state_help.html
+++ b/ietf/templates/doc/state_help.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load static %}
+{% load origin static ietf_filters textfilters %}
 {% block title %}{{ title }}{% endblock %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
@@ -27,7 +26,7 @@ <h1>{{ title }}</h1>
             {% for state in states %}
                 <tr id="{{ state.slug|default:"idexists" }}">
                     <th scope="row">{{ state.name }}</th>
-                    <td>{{ state.desc|safe|linebreaksbr }}</td>
+                    <td>{{ state.desc|urlize_ietf_docs|linkify }}</td>
                     {% if has_next_states %}
                         <td>
                             {% for s in state.next_states.all %}