diff --git a/edivorce/apps/core/templates/pdf/form38_we.html b/edivorce/apps/core/templates/pdf/form38_we.html
index 2fea2feb..9d4ef4f0 100644
--- a/edivorce/apps/core/templates/pdf/form38_we.html
+++ b/edivorce/apps/core/templates/pdf/form38_we.html
@@ -152,7 +152,7 @@
         {% if responses.form38_dummy_new_name %}
             <p class="schIndent1">
                 8 Pursuant to section 5 of the <em>Name Act</em>, {% if responses.form38_dummy_for_who %}{{ responses.form38_dummy_for_who }}{% else %}<span class="form-entry not-complete">&nbsp;</span>{% endif %}
-                is seeking to change <b>his/her</b> name from {% if responses.name_you %}{{ responses.name_you }}{% else %}<span class="form-entry not-complete">&nbsp;</span>{% endif %} to {% if responses.form38_dummy_new_name %}{{ responses.form38_dummy_new_name }}{% else %}<span class="form-entry not-complete">&nbsp;</span>{% endif %}.
+                is seeking to change <b>his/her</b> name from {% if responses.name_you and responses.form38_dummy_for_who == 'Claimant 1' %}{{ responses.name_you }} {% elif responses.name_spouse and responses.form38_dummy_for_who == 'Claimant 2' %}{{ responses.name_spouse }}{% else %}<span class="form-entry not-complete">&nbsp;</span>{% endif %} to {% if responses.form38_dummy_new_name %}{{ responses.form38_dummy_new_name }}{% else %}<span class="form-entry not-complete">&nbsp;</span>{% endif %}.
                 This application for a name change relates only to {% if responses.form38_dummy_for_who %}{{ responses.form38_dummy_for_who }}{% else %}<span class="form-entry not-complete">&nbsp;</span>{% endif %}.
             </p>
         {% endif %}
diff --git a/edivorce/apps/core/templates/question/10_location.html b/edivorce/apps/core/templates/question/10_location.html
index 5cb70c9f..0419032d 100644
--- a/edivorce/apps/core/templates/question/10_location.html
+++ b/edivorce/apps/core/templates/question/10_location.html
@@ -28,7 +28,7 @@
     <select class="response-dropdown form-control" name="court_registry_for_filing">
         <option value="" disabled selected>Please select</option>
         {% for registry in registries %}
-            <option value='{{registry}}'>{{registry}}</option>
+            <option value='{{registry}}' {% if court_registry_for_filing == registry %} selected {% endif %}>{{registry}}</option>
         {% endfor %}
     </select>
 </div>
diff --git a/edivorce/apps/core/templates/question/12_uncategorized.html b/edivorce/apps/core/templates/question/12_uncategorized.html
index 7f8778a6..630496ab 100644
--- a/edivorce/apps/core/templates/question/12_uncategorized.html
+++ b/edivorce/apps/core/templates/question/12_uncategorized.html
@@ -62,7 +62,7 @@
                 {% input_field type="radio" name="form38_dummy_together" autocomplete="off" value="together" %} Together
             </label>
             <label class="btn btn-radio btn-radio-long">
-                {% input_field type="radio" name="form38_dummy_together" autocomplete="off" value="separte" %} Separate
+                {% input_field type="radio" name="form38_dummy_together" autocomplete="off" value="separate" %} Separate
             </label>
         </div>
         <div>
diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py
index ad2cf0fd..faf62953 100644
--- a/edivorce/apps/core/utils/question_step_mapping.py
+++ b/edivorce/apps/core/utils/question_step_mapping.py
@@ -42,4 +42,7 @@ question_step_mapping = {'prequalification': ['married_marriage_like', 'lived_in
 """
     Dictionary for a list of court registries
 """
-list_of_registries = ['Vancouver', 'Burnaby', 'Port Coquitlam', 'New Westminster',]
+list_of_registries = ['Fort St. John', 'Dawson Creek', 'Prince Rupert', 'Terrace', 'Smithers', 'Prince George', 'Quesnel',
+                      'Williams Lake', 'Campbell River', 'Powell River', 'Courtenay', 'Port Alberni', 'Duncan', 'Nanaimo',
+                      'Victoria', 'Golden', 'Kamloops', 'Salmon Arm', 'Vernon', 'Kelowna', 'Penticton', 'Nelson', 'Rossland',
+                      'Cranbrook', 'Chilliwack', 'New Westminster', 'Vancouver', 'Fort Nelson', 'Revelstoke',]