diff --git a/edivorce/apps/core/templates/dashboard/final_filing.html b/edivorce/apps/core/templates/dashboard/final_filing.html
index cb2cb681..dcd84017 100644
--- a/edivorce/apps/core/templates/dashboard/final_filing.html
+++ b/edivorce/apps/core/templates/dashboard/final_filing.html
@@ -290,9 +290,10 @@
                     </p>
                     <ul class="no-bullets">
                         {% if court_registry_for_filing %}
-                            <li>{{ court_registry_for_filing }}</li>
-                            <li>{{ court_registry_for_filing_address }}</li>
-                            <li>{{ court_registry_for_filing_postal_code }}</li>
+                            <li>{{ court_registry_for_filing }} Law Courts</li>
+                            <li>{{ court_registry_for_filing_address|safe }}</li>
+                            <li>{{ court_registry_for_filing }}, B.C.</li>
+                            <li>{{ court_registry_for_filing_postal_code|safe }}</li>
                         {% else %}
                             <p class="error-text">
                                 Go back to the questionnaire to choose a
diff --git a/edivorce/apps/core/templates/partials/filing_location.html b/edivorce/apps/core/templates/partials/filing_location.html
index db83336c..07a48722 100644
--- a/edivorce/apps/core/templates/partials/filing_location.html
+++ b/edivorce/apps/core/templates/partials/filing_location.html
@@ -1,8 +1,9 @@
 {% if court_registry_for_filing %}
     <ul class="no-bullets" id="court-registry-location">
-        <li id="court-registry-city"><b>{{ court_registry_for_filing }}</b></li>
-        <li id="court-registry-address">{{ court_registry_for_filing_address }}</li>
-        <li id="court-registry-postal-code">{{ court_registry_for_filing_postal_code }}</li>
+        <li id="court-registry-name"><b>{{ court_registry_for_filing }} Law Courts</b></li>
+        <li id="court-registry-address">{{ court_registry_for_filing_address|safe }}</li>
+        <li id="court-registry-city">{{ court_registry_for_filing }}, B.C.</li>        
+        <li id="court-registry-postal-code">{{ court_registry_for_filing_postal_code|safe }}</li>
     </ul>
 {% else %}
     <div class="review-warning">
diff --git a/edivorce/apps/core/templates/partials/tooltips/court_registry.html b/edivorce/apps/core/templates/partials/tooltips/court_registry.html
index 8f904038..8dbeaf88 100644
--- a/edivorce/apps/core/templates/partials/tooltips/court_registry.html
+++ b/edivorce/apps/core/templates/partials/tooltips/court_registry.html
@@ -9,11 +9,10 @@
     <br/>
     <br/>
     {% if court_registry_for_filing %}
-        {{ court_registry_for_filing }}
-        <br/>
-        {{ court_registry_for_filing_address }}
-        <br/>
-        {{ court_registry_for_filing_postal_code }}
+        {{ court_registry_for_filing }} Law Courts<br>
+        {{ court_registry_for_filing_address|safe }}
+        {{ court_registry_for_filing }}, B.C.<br>
+        {{ court_registry_for_filing_postal_code|safe }}
     {% else %}
         No Court Registry was chosen
     {% endif %}