diff --git a/fec/home/models.py b/fec/home/models.py
index 4c4731d81c..37d54760ba 100644
--- a/fec/home/models.py
+++ b/fec/home/models.py
@@ -724,7 +724,8 @@ def display_date(self):
     @property
     def extension(self):
         # Return the file extension of file_url
-        return self.file_url.rsplit('.', 1)[1].upper()
+        if self.file_url:
+            return self.file_url.rsplit('.', 1)[1].upper()
 
 
 class DocumentFeedPage(ContentPage):
@@ -1372,7 +1373,7 @@ class ReportingDatesTable(Page):
         ('html', blocks.RawHTMLBlock()),
         ('internal_button', InternalButtonBlock()),
         ('external_button', ExternalButtonBlock()),
-        ('dates_table', ReportingTableBlock(blank=True, required=False,form_classname='title')),
+        ('dates_table', ReportingTableBlock(blank=True, required=False, form_classname='title')),
     ], blank=True, null=True, use_json_field=True, collapsed=False)
 
     footnotes = StreamField([
diff --git a/fec/home/templates/home/document_page.html b/fec/home/templates/home/document_page.html
index 4bee83d23e..22460c0550 100644
--- a/fec/home/templates/home/document_page.html
+++ b/fec/home/templates/home/document_page.html
@@ -4,8 +4,17 @@
 {% load static %}
 {% block body_class %}template-{{ self.get_verbose_name | slugify }}{% endblock %}
 
+
+
 {% block content %}
 
+<!--{% if "reports-about-fec" in request.path and page.content_type.model == "documentpage" and self.file_url %}
+    <meta http-equiv="refresh" content="0; url={% include_block self.file_url %}">
+{% endif %} -->
+
+
+
+
 {% include 'partials/breadcrumbs.html' with page=self links=self.get_ancestors style='secondary' %}
 
 <article class="main">
@@ -13,14 +22,23 @@
     <header class="heading--main heading--with-date">
       <ul class="tags">
         <li class="tag tag--secondary t-upper">
-          {{ self.category }}
+     <a href="{{self.get_parent.url}}?category={{ self.category | cms_query_syntax }}">{{ self.category }}</a>
         </li>
       </ul>
       <div class="row">
         {% spaceless %}{# for inline blocks #}
-        <h1 class="heading__left">{% formatted_title self %}</h1>
+      <h1 class="heading__left">{% if self.file_url %}<a href="{{ self.file_url }}">{% formatted_title self %}</a>
+      {% else %}
+       {% formatted_title self %}
+      {% endif %}</h1>
         <div class="heading__right">
-          <span class="t-sans">{{ self.display_date }}</span>
+          <span class="t-sans">{{ self.display_date }} |
+        {% if self.file_url %} <a href="{{ self.file_url }}">{{ self.extension }}</a>
+        {% else %}
+          {{ self.extension }}
+        {% endif %}
+        {% if self.size %} | ({{ self.size }}){% endif %}</span>
+
         </div>
         {% endspaceless %}
       </div>
@@ -31,5 +49,15 @@ <h1 class="heading__left">{% formatted_title self %}</h1>
 </article>
 
 {% include 'partials/disclaimer.html' %}
+<script>
+// document.getElementsByClassName('main')[0].insertAdjacentHTML("beforebegin", "<p>You will be directed</p>")
+// setTimeout(() => {
+// var meta = document.createElement('meta');
+// meta.httpEquiv = "refresh" ;
+// meta.content = "3; url={% include_block self.file_url %}";
+// document.getElementsByTagName('head')[0].appendChild(meta);
+// }, "0");
+
+</script>
 
 {% endblock %}
diff --git a/fec/home/templates/partials/document.html b/fec/home/templates/partials/document.html
index 5ea04da494..39f50d600b 100644
--- a/fec/home/templates/partials/document.html
+++ b/fec/home/templates/partials/document.html
@@ -29,6 +29,6 @@ <h3>
     </h3>
   {% endif %}
     <div class="post__meta">
-      <a class="tag tag--secondary" href="">{{ document.category }}</a>
+      <a class="tag tag--secondary" href="{{self.get_parent.url}}?category={{ document.category | cms_query_syntax }}">{{ document.category }}</a>
     </div>
 </article>
diff --git a/fec/home/templatetags/filters.py b/fec/home/templatetags/filters.py
index d33ae4f3bf..d94c52f237 100644
--- a/fec/home/templatetags/filters.py
+++ b/fec/home/templatetags/filters.py
@@ -189,3 +189,10 @@ def get_file_type(value):
     file_type = "EXCEL" if xl else file_extension
 
     return file_type
+
+
+@register.filter(name='cms_query_syntax')
+def cms_query_syntax(string):
+    query = string.replace(' ', '+').lower()
+
+    return query