diff --git a/api/requirements.txt b/api/requirements.txt
index bc4114b68..a4fb08ae0 100644
--- a/api/requirements.txt
+++ b/api/requirements.txt
@@ -1,5 +1,5 @@
 # Main
-django==4.1.10
+django==4.1.13
 django-filter>=21.1,<22
 djangorestframework>=3.13.1,<4
 djangorestframework-bulk>=0.2.1,<1
@@ -12,7 +12,7 @@ psycopg2-binary>=2.7.3.1,<3
 pynacl>=1.4
 
 # Web Server
-gunicorn>=19.7.1,<20
+gunicorn>=22.0.0,<23
 whitenoise>=4.1.2,<4.2
 
 # Documentation
@@ -28,4 +28,5 @@ pillow>=9.2.0
 numpy>=1.19.5
 jsonschema>=3.2.0,<4
 
-PyPDF2 >=1.26.0,<3
\ No newline at end of file
+PyPDF2 >=1.26.0,<3
+setuptools >= 70.0.0
diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule1.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule1.vue
index 3f5c4636c..2904f80c4 100644
--- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule1.vue
+++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule1.vue
@@ -71,7 +71,7 @@
                     <div style="margin-top:-20px;margin-left:27px;">
                     <span>Other <i>(specify)</i>:</span>
                     <span style="margin-left:5px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{ scheduleInfo.eventTypeComment |truncate-word-after(70)}}</span>
-                    <div v-if="scheduleInfo.eventTypeComment.length >=  70" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{scheduleInfo.eventTypeComment|truncate-word-before(70)}}</div>    
+                    <div v-if="scheduleInfo.eventTypeComment && scheduleInfo.eventTypeComment.length >=  70" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{scheduleInfo.eventTypeComment|truncate-word-before(70)}}</div>    
 
                     </div> 
                     </span> 
@@ -92,7 +92,7 @@
                 <span style="margin-left:60px;min-width:90px;text-align:center;">Time</span>  
                 <span style="margin-left:90px;min-width:90px;text-align:center;">Method of attendance</span> 
             </div> 
-                <div v-if="scheduleInfo.attendanceMethod.length >= 20" style="margin-top:1px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:left;">{{scheduleInfo.attendanceMethod|truncate-word-before(20)}}</div>        
+                <div v-if="scheduleInfo.attendanceMethod && scheduleInfo.attendanceMethod.length >= 20" style="margin-top:1px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:left;">{{scheduleInfo.attendanceMethod|truncate-word-before(20)}}</div>        
             </div> 
             
             <div style="margin-left:5px;margin-top:5px;display:inline-block;"><b>by another method of attendance as follows:</b></div>  
diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule2.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule2.vue
index 468531086..65a782a0a 100644
--- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule2.vue
+++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule2.vue
@@ -109,7 +109,7 @@
                         <div style="margin-top:-20px;margin-left:27px;">
                         <span style="margin-left:9px;">Other <i>(specify)</i>:</span>
                         <span style="margin-left:5px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{ modReqInfo.waiveChangeRequirementComment |truncate-word-after(70)}}</span>
-                        <div v-if="modReqInfo.waiveChangeRequirementComment.length >=  70" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{modReqInfo.waiveChangeRequirementComment|truncate-word-before(70)}}</div>    
+                        <div v-if="modReqInfo.waiveChangeRequirementComment && modReqInfo.waiveChangeRequirementComment.length >=  70" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{modReqInfo.waiveChangeRequirementComment|truncate-word-before(70)}}</div>    
                         </div> 
                         </span>
                     </div>   
@@ -194,7 +194,7 @@
                         <div style="margin-top:-20px;margin-left:27px;">
                         <span style="margin-left:9px;">Other <i>(specify)</i>:</span>
                         <span style="margin-left:5px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{ modReqInfo.modifyChangeRequirementComment |truncate-word-after(70)}}</span>
-                        <div v-if="modReqInfo.modifyChangeRequirementComment.length >=  70" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{modReqInfo.modifyChangeRequirementComment|truncate-word-before(70)}}</div>    
+                        <div v-if="modReqInfo.modifyChangeRequirementComment && modReqInfo.modifyChangeRequirementComment.length >=  70" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{modReqInfo.modifyChangeRequirementComment|truncate-word-before(70)}}</div>    
                         </div> 
                     </span>
                     </div>   
diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule3.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule3.vue
index 983bb828b..4cb18728c 100644
--- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule3.vue
+++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule3.vue
@@ -64,7 +64,7 @@ the rules, including a time limit set by an order or direction, even after the t
                 <span style="margin-left:25px;min-width:90px;text-align: center;display: inline-block;">Date (dd/mmm/yyyy)</span>
                 <span style="margin-left:130px;text-align:center;">Method of attendance</span> 
                 </div> 
-                <div v-if="modReqInfo.judgeName.length >= 30" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:left;">{{modReqInfo.judgeName|truncate-word-before(30)}}</div>    
+                <div v-if="modReqInfo.judgeName && modReqInfo.judgeName.length >= 30" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:left;">{{modReqInfo.judgeName|truncate-word-before(30)}}</div>    
 
                 </div> 
                 
@@ -75,7 +75,7 @@ the rules, including a time limit set by an order or direction, even after the t
                     <div style="margin-top:-20px;margin-left:20px;">
                         <span style="margin-left:9px;">Other <i>(specify)</i>:</span>
                         <span style="margin-left:5px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{ modReqInfo.appliedRequirementsListComment |truncate-word-after(70)}}</span>
-                        <div v-if="modReqInfo.appliedRequirementsListComment.length >=  70" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{modReqInfo.appliedRequirementsListComment|truncate-word-before(70)}}</div>    
+                        <div v-if="modReqInfo.appliedRequirementsListComment && modReqInfo.appliedRequirementsListComment.length >=  70" style="margin-top:3px;margin-left:0px;min-width: 200px;display: inline-block;border-bottom: 3px solid grey;border-width:1.2px;background-color:#dedede;border-color:black;text-align:center;">{{modReqInfo.appliedRequirementsListComment|truncate-word-before(70)}}</div>    
                         
                     </div>  
                     </span>
diff --git a/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/CommonSection.vue b/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/CommonSection.vue
index 7f4883f7e..c7a724392 100644
--- a/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/CommonSection.vue
+++ b/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/CommonSection.vue
@@ -502,7 +502,7 @@
                             </div>
         <!-- Part 7E -->
         <div style="border: 1px solid #333; margin-bottom: 8px; padding: 20px;">
-                                <check-box boxMargin="0" shiftmark="0" :check="result.guardianOfChildSurvey.applicationType.includes('cancelGuardian') || result.guardianOfChildSurvey.applicationType.includes('becomeGuardian')  ?'yes':''" text="<b>Guardianship of a child</b> - Appointing a new guardian or cancelling guardianship of a child"/>
+                                <check-box boxMargin="0" shiftmark="0" :check="result.guardianOfChildSurvey && result.guardianOfChildSurvey.applicationType && (result.guardianOfChildSurvey.applicationType.includes('cancelGuardian') || result.guardianOfChildSurvey.applicationType.includes('becomeGuardian'))  ?'yes':''" text="<b>Guardianship of a child</b> - Appointing a new guardian or cancelling guardianship of a child"/>
 
                                 
                                 <NoteBox borderRadius="8px" border="1px solid #333" style="padding: 20px;margin-left:30px;">
diff --git a/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/Schedule1.vue b/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/Schedule1.vue
index 711053e85..88edff073 100644
--- a/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/Schedule1.vue
+++ b/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/Schedule1.vue
@@ -72,7 +72,7 @@
                         <br>
                         <i>List the details of the order you are asking for. You may leave this question blank.</i>
                         
-                        <div class="answerbox" style="height: 100px; background-color:#dedede;">
+                        <div class="answerbox" style="min-height: 100px; background-color:#dedede;">
                             {{parentArrInfo.parentResp.expl}}
                         </div>
                     </div>
diff --git a/web/src/components/steps/writtenResponse/reviewWR/pdf/Form19Layout.vue b/web/src/components/steps/writtenResponse/reviewWR/pdf/Form19Layout.vue
index 2d6cb54ce..74a39528f 100644
--- a/web/src/components/steps/writtenResponse/reviewWR/pdf/Form19Layout.vue
+++ b/web/src/components/steps/writtenResponse/reviewWR/pdf/Form19Layout.vue
@@ -543,12 +543,13 @@ export default class Form19Layout extends Vue {
             wrInformation.disagree = agreeDisagreeData.agreeDisagree.includes('disagree');
             wrInformation.partialagreed = agreeDisagreeData.agreeDisagree.includes('partialagree');
             wrInformation.partialdisagree = agreeDisagreeData.agreeDisagree.includes('partialdisagree');
-            wrInformation.agreeAdditionalDetailsYesNo = agreeDisagreeData.agreeAdditionalDetailsYesNo.includes('y');
+            wrInformation.agreeAdditionalDetailsYesNo = agreeDisagreeData.agreeAdditionalDetailsYesNo && agreeDisagreeData.agreeAdditionalDetailsYesNo.includes('y');
+            
             if (wrInformation.agreed){
                 wrInformation.agreeDetails = agreeDisagreeData.agreeDetails;
                 if (wrInformation.agreeAdditionalDetailsYesNo){
-                wrInformation.agreeAdditionalDetails = agreeDisagreeData.agreeAdditionalDetails;
-            }
+                    wrInformation.agreeAdditionalDetails = agreeDisagreeData.agreeAdditionalDetails;
+                }
             }
             if (wrInformation.disagree){
                 wrInformation.disagreeDetails = agreeDisagreeData.disAgreeDetails;
diff --git a/web/src/components/utils/PopulateForms/components/FormHeader.vue b/web/src/components/utils/PopulateForms/components/FormHeader.vue
index 9a8ed3b54..a6513800e 100644
--- a/web/src/components/utils/PopulateForms/components/FormHeader.vue
+++ b/web/src/components/utils/PopulateForms/components/FormHeader.vue
@@ -6,10 +6,10 @@
                 <div style="font-size:10pt;"><b>FORM 3</b></div>
                 <div>Provincial Court Family Rules (Rule 24)</div>
             </div>
-            <div style="width:200px;margin-left:-70px;">
+            <div style="width:200px;">
                 <CourtStamp></CourtStamp>
             </div>
-            <div style="width: 40%; float:right; font-size: 8pt;margin-left:-50px;">
+            <div style="width: 40%; font-size: 8pt;">
                 <div style="width: 100%; display: inline-block;">
                     <div style="float: left; width: 45%; padding: 2px;text-align:right;"> Registry location:&nbsp; </div>
                     <div style="float: left; background-color: #d6d6d6; width: 55%; padding: 2px;"> {{ tableItems[0].value }} </div>
diff --git a/web/src/filters/locationRegistries.ts b/web/src/filters/locationRegistries.ts
index 3cb3ebcc9..87f09ed0a 100644
--- a/web/src/filters/locationRegistries.ts
+++ b/web/src/filters/locationRegistries.ts
@@ -5,6 +5,7 @@ export const FamilyJusticeRegistries = [
 ];
 
 export const EarlyResolutionsRegistries = [
-    "1201",//"Victoria Law Courts",
-    "3585"//"Surrey Provincial Court"
+    "1201", // "Victoria Law Courts",
+    "3585", // "Surrey Provincial Court"
+    "3531" // "Port Coquitlam Court"
 ]; 
\ No newline at end of file