diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html
index 4f0b0958..4135329a 100644
--- a/edivorce/apps/core/templates/pdf/form1.html
+++ b/edivorce/apps/core/templates/pdf/form1.html
@@ -418,14 +418,14 @@
                 <tr>
                   <td colname="c2">
                     <span class="td-list-item">
-                      A. {% checkbox responses.order_respecting_arrangement children_of_marriage='YES' %}
+                      A. {% checkbox responses.order_respecting_arrangement children_of_marriage='YES' want_which_orders='Child support' %}
                     </span>
                       <div class="td-list-text">
                           Claimant 1 and Claimant 2 are asking for the following
                           order respecting arrangements for parenting or
                           contact:
                           <span class="form-entry form-textarea not-complete form-list-textarea">
-    {% if responses.children_of_marriage == 'YES' %}
+    {% if responses.children_of_marriage == 'YES' and responses.order_respecting_arrangement and 'Child support' in responses.want_which_orders %}
                             <ul>{{ responses.order_respecting_arrangement|striptags|linebreaksli }}</ul>
     {% endif %}
                           </span>
@@ -435,13 +435,13 @@
                 <tr>
                     <td colname="c2">
                         <span class="td-list-item">
-                          B. {% checkbox responses.order_for_child_support children_of_marriage='YES' %}
+                          B. {% checkbox responses.order_for_child_support children_of_marriage='YES' want_which_orders='Child support' %}
                         </span>
                         <div class="td-list-text">
                             Claimant 1 and Claimant 2 are asking for an order for
                             child support as follows:
                             <span class="form-entry form-textarea not-complete form-list-textarea">
-    {% if responses.children_of_marriage == 'YES' %}
+    {% if responses.children_of_marriage == 'YES' and responses.order_for_child_support and 'Child support' in responses.want_which_orders %}
                               <ul>{{ responses.order_for_child_support|striptags|linebreaksli }}</ul>
     {% endif %}
                             </span>
@@ -451,7 +451,7 @@
                 <tr>
                     <td colname="c2">
                         <span class="td-list-item">
-                          C. {% checkbox responses.child_support_act children_of_marriage='YES' %}
+                          C. {% checkbox responses.child_support_act children_of_marriage='YES' want_which_orders='Child support' %}
                         </span>
                         <div class="td-list-text">
                           Claimant 1 and Claimant 2 are asking for the orders
@@ -459,10 +459,10 @@
                           following statute(s):<br>
                           [<em>Check one or both of the following boxes, as
                             applicable.</em>]<br><br>
-                          {% checkbox child_support_act='the Divorce Act (Canada)' children_of_marriage='YES' %}
+                          {% checkbox child_support_act='the Divorce Act (Canada)' children_of_marriage='YES' want_which_orders='Child support' %}
                           the <em>Divorce Act</em> (Canada)
                           &nbsp;&nbsp;&nbsp;&nbsp;
-                          {% checkbox child_support_act='the Family Law Act' children_of_marriage='YES' %}
+                          {% checkbox child_support_act='the Family Law Act' children_of_marriage='YES' want_which_orders='Child support' %}
                           the <em>Family Law Act</em>
                         </div>
                     </td>