diff --git a/src/api/certificates/source/birth-certificate-certified-copy.svg b/src/api/certificates/source/birth-certificate-certified-copy.svg
index dc1efdf4a..a5de61c60 100644
--- a/src/api/certificates/source/birth-certificate-certified-copy.svg
+++ b/src/api/certificates/source/birth-certificate-certified-copy.svg
@@ -150,7 +150,11 @@
   </text>
   <g clip-path="url(#clip7_946_2501)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
+      {{#ifCond ageOfMotherInYears '===' undefined }}
       <tspan x="307" y="286.104">{{motherBirthDate}}</tspan>
+      {{else}}
+      <tspan x="307" y="286.104">{{ageOfMotherInYears}} years old</tspan>
+      {{/ifCond}}
     </text>
   </g>
   <line x1="65" y1="292.5" x2="533" y2="292.5" stroke="#ECECEC" />
@@ -162,7 +166,7 @@
   </text>
   <g clip-path="url(#clip8_946_2501)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
-      <tspan x="307" y="306.104">{{formattedAddress districtPrimaryMother statePrimaryMother countryPrimaryMother}}</tspan>
+      <tspan x="307" y="306.104">{{ districtPrimaryMother }}{{ internationalDistrictPrimaryMother }}, {{ statePrimaryMother }}{{ internationalStatePrimaryMother }}, {{ countryPrimaryMother }}</tspan>
     </text>
   </g>
   <line x1="65" y1="312.5" x2="533" y2="312.5" stroke="#ECECEC" />
@@ -213,7 +217,11 @@
   </text>
   <g clip-path="url(#clip12_946_2501)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
+      {{#ifCond ageOfFatherInYears '===' undefined }}
       <tspan x="307" y="412.104">{{fatherBirthDate}}</tspan>
+      {{else}}
+      <tspan x="307" y="412.104">{{ageOfFatherInYears}} years old</tspan>
+      {{/ifCond}}
     </text>
   </g>
   <line x1="65" y1="418.5" x2="533" y2="418.5" stroke="#ECECEC" />
@@ -225,7 +233,7 @@
   </text>
   <g clip-path="url(#clip13_946_2501)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
-      <tspan x="307" y="432.104">{{formattedAddress districtPrimaryFather statePrimaryFather countryPrimaryFather}}</tspan>
+      <tspan x="307" y="432.104">{{ districtPrimaryFather }}{{ internationalDistrictPrimaryFather }}, {{ statePrimaryFather }}{{ internationalStatePrimaryFather }}, {{ countryPrimaryFather }}</tspan>
     </text>
   </g>
   <line x1="65" y1="438.5" x2="533" y2="438.5" stroke="#ECECEC" />
diff --git a/src/api/certificates/source/death-certificate-certified-copy.svg b/src/api/certificates/source/death-certificate-certified-copy.svg
index 5579e17d5..c7021e010 100644
--- a/src/api/certificates/source/death-certificate-certified-copy.svg
+++ b/src/api/certificates/source/death-certificate-certified-copy.svg
@@ -72,7 +72,7 @@
   </text>
   <g clip-path="url(#clip2_948_2918)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
-      <tspan x="312" y="188.104">{{formattedAddress districtPrimaryDeceased statePrimaryDeceased countryPrimaryDeceased}}</tspan>
+      <tspan x="312" y="188.104">{{ districtPrimaryDeceased }}{{ internationalDistrictPrimaryDeceased }}, {{ statePrimaryDeceased }}{{ internationalStatePrimaryDeceased }}, {{ countryPrimaryDeceased }}</tspan>
     </text>
   </g>
   <line x1="70" y1="194.5" x2="514" y2="194.5" stroke="#ECECEC" />
diff --git a/src/api/certificates/source/marriage-certificate-certified-copy.svg b/src/api/certificates/source/marriage-certificate-certified-copy.svg
index 69cb3619a..174336193 100644
--- a/src/api/certificates/source/marriage-certificate-certified-copy.svg
+++ b/src/api/certificates/source/marriage-certificate-certified-copy.svg
@@ -137,7 +137,7 @@
   </text>
   <g clip-path="url(#clip8_948_3199)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
-      {{#ifCond ageOfGroomInYears '===' undefined }}
+      {{#ifCond ageOfBrideInYears '===' undefined }}
       <tspan x="312" y="314.104">{{brideBirthDate}}</tspan>
       {{else}}
       <tspan x="312" y="314.104">{{ageOfBrideInYears}} years old</tspan>
diff --git a/src/form/common/certificate/handlebars/helpers.ts b/src/form/common/certificate/handlebars/helpers.ts
index e02620bd3..58a7352d4 100644
--- a/src/form/common/certificate/handlebars/helpers.ts
+++ b/src/form/common/certificate/handlebars/helpers.ts
@@ -24,19 +24,6 @@ export function debug(): Handlebars.HelperDelegate {
   }
 }
 
-export function formattedAddress(): Handlebars.HelperDelegate {
-  return function (
-    this: any,
-    address1: string,
-    address2: string,
-    address3: string
-  ) {
-    let address = address1 ? `${address1}, ` : ''
-    address += address2 ? `${address2}, ` : ''
-    address += address3 ? address2 : ''
-    return address
-  }
-}
 export function ordinalFormatDate(): Handlebars.HelperDelegate {
   return function (dateString: string) {
     const date = new Date(dateString.trim())