diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py
index 32061ea5e..414f87a63 100644
--- a/ietf/ipr/views.py
+++ b/ietf/ipr/views.py
@@ -737,7 +737,8 @@ def search(request):
                 "iprs": iprs,
                 "docs": docs,
                 "doc": doc,
-                "form":form},
+                "form":form,
+                "states":states},
                 context_instance=RequestContext(request)
             )
 
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 6d58fcde5..341207726 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -231,7 +231,7 @@
 
   <div class="links">
     <a href="mailto:{{ doc.name }}@tools.ietf.org?subject=Mail%20regarding%20{{ doc.name }}" rel="nofollow">Email Authors</a>
-  | <a href="{% url "ipr_search" %}?option=document_search&amp;id={{ doc.name }}" rel="nofollow">IPR Disclosures{% if doc.related_ipr %} ({{doc.related_ipr|length}}){% endif %}</a>
+  | <a href="{% url "ipr_search" %}?submit=draft&amp;id={{ doc.name }}" rel="nofollow">IPR Disclosures{% if doc.related_ipr %} ({{doc.related_ipr|length}}){% endif %}</a>
   | <a href="{% url 'doc_references' doc.canonical_name %}" rel="nofollow">References</a>
   | <a href="{% url 'doc_referenced_by' doc.canonical_name %}" rel="nofollow">Referenced By</a>
   | <a href="http://www.ietf.org/tools/idnits?url=http://www.ietf.org/archive/id/{{ doc.filename_with_rev }}" rel="nofollow" target="_blank">Check nits</a>
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index f6b77be65..56d7d861e 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -23,11 +23,13 @@
              </tr>
              {% if doc.iprdocrel_set.all %}
               {% for ipr in doc.iprdocrel_set.all %}
+              {% if ipr.disclosure.state.slug in states %}
                <tr valign="top">
                   <td width="100">{{ ipr.disclosure.time|date:"Y-m-d" }}</td>
                   <td width="90"><li>ID # {{ ipr.disclosure.id }}</li></td>
                               <td><a href="{% url "ietf.ipr.views.show" id=ipr.id %}">"{{ ipr.disclosure.title }}"</a></td>
                </tr>
+               {% endif %}
               {% endfor %}
              {% else %}
              <tr>