diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index e459e7841..b681324e4 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -15,81 +15,63 @@ export const TemplateList = (type, context) => {
           casl_authorization: {
             title: i18n.t("printcenter.jobs.casl_authorization"),
             description: "CASL Authorization",
-            subject: `${i18n.t("printcenter.jobs.casl_authorization")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.casl_authorization"),
             key: "casl_authorization",
             disabled: false,
           },
           diagnostic_authorization: {
             title: i18n.t("printcenter.jobs.diagnostic_authorization"),
             description: "Diagnostic Authorization",
-            subject: `${i18n.t(
-              "printcenter.jobs.diagnostic_authorization"
-            )} - ${context && context.job && context.job.ro_number}`,
+            subject: i18n.t("printcenter.jobs.diagnostic_authorization"),
             key: "diagnostic_authorization",
             disabled: false,
           },
           job_notes: {
             title: i18n.t("printcenter.jobs.job_notes"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.job_notes")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.job_notes"),
             key: "job_notes",
             disabled: false,
           },
           ro_with_description: {
             title: i18n.t("printcenter.jobs.ro_with_description"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.ro_with_description")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.ro_with_description"),
             key: "ro_with_description",
             disabled: false,
           },
           window_tag: {
             title: i18n.t("printcenter.jobs.window_tag"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.window_tag")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.window_tag"),
             key: "window_tag",
             disabled: false,
           },
           payments_by_job: {
             title: i18n.t("printcenter.jobs.payments_by_job"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.payments_by_job")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.payments_by_job"),
             key: "payments_by_job",
             disabled: false,
           },
           appointment_reminder: {
             title: i18n.t("printcenter.jobs.appointment_reminder"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.appointment_reminder")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.appointment_reminder"),
             key: "appointment_reminder",
             disabled: false,
           },
           worksheet_by_line_number: {
             title: i18n.t("printcenter.jobs.worksheet_by_line_number"),
             description: "All Jobs Notes",
-            subject: `${i18n.t(
-              "printcenter.jobs.worksheet_by_line_number"
-            )} - ${context && context.job && context.job.ro_number}`,
+            subject: i18n.t("printcenter.jobs.worksheet_by_line_number"),
             key: "worksheet_by_line_number",
             disabled: false,
           },
           worksheet_sorted_by_operation: {
             title: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
             description: "All Jobs Notes",
-            subject: `${i18n.t(
-              "printcenter.jobs.worksheet_sorted_by_operation"
-            )} - ${context && context.job && context.job.ro_number}`,
+            subject: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
             key: "worksheet_sorted_by_operation",
             disabled: false,
           },
@@ -98,9 +80,9 @@ export const TemplateList = (type, context) => {
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
             ),
             description: "All Jobs Notes",
-            subject: `${i18n.t(
+            subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
-            )} - ${context && context.job && context.job.ro_number}`,
+            ),
             key: "worksheet_sorted_by_operation_no_hours",
             disabled: false,
           },
@@ -109,107 +91,86 @@ export const TemplateList = (type, context) => {
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
             ),
             description: "All Jobs Notes",
-            subject: `${i18n.t(
+            subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
-            )} - ${context && context.job && context.job.ro_number}`,
+            ),
             key: "worksheet_sorted_by_operation_part_type",
             disabled: false,
           },
           supplement_request: {
             title: i18n.t("printcenter.jobs.supplement_request"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.supplement_request")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.supplement_request"),
             key: "supplement_request",
             disabled: false,
           },
           final_invoice: {
             title: i18n.t("printcenter.jobs.final_invoice"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.final_invoice")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.final_invoice"),
             key: "final_invoice",
             disabled: false,
           },
           payment_request: {
             title: i18n.t("printcenter.jobs.payment_request"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.payment_request")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.payment_request"),
             key: "payment_request",
             disabled: false,
           },
           invoice_total_payable: {
             title: i18n.t("printcenter.jobs.invoice_total_payable"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.invoice_total_payable")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.invoice_total_payable"),
             key: "invoice_total_payable",
             disabled: false,
           },
           invoice_customer_payable: {
             title: i18n.t("printcenter.jobs.invoice_customer_payable"),
             description: "All Jobs Notes",
-            subject: `${i18n.t(
-              "printcenter.jobs.invoice_customer_payable"
-            )} - ${context && context.job && context.job.ro_number}`,
+            subject: i18n.t("printcenter.jobs.invoice_customer_payable"),
             key: "invoice_customer_payable",
             disabled: false,
           },
           parts_order_history: {
             title: i18n.t("printcenter.jobs.parts_order_history"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.parts_order_history")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.parts_order_history"),
             key: "parts_order_history",
             disabled: false,
           },
           glass_express_checklist: {
             title: i18n.t("printcenter.jobs.glass_express_checklist"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.glass_express_checklist")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.glass_express_checklist"),
             key: "glass_express_checklist",
             disabled: false,
           },
           estimate: {
             title: i18n.t("printcenter.jobs.estimate"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.estimate")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.estimate"),
             key: "estimate",
             disabled: false,
           },
           parts_list: {
             title: i18n.t("printcenter.jobs.parts_list"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.parts_list")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.parts_list"),
             key: "parts_list",
             disabled: false,
           },
           coversheet_portrait: {
             title: i18n.t("printcenter.jobs.coversheet_portrait"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.coversheet_portrait")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.coversheet_portrait"),
             key: "coversheet_portrait",
             disabled: false,
-          },      filing_coverhseet_portrait: {
+          },
+          filing_coverhseet_portrait: {
             title: i18n.t("printcenter.jobs.filing_coverhseet_portrait"),
             description: "All Jobs Notes",
-            subject: `${i18n.t("printcenter.jobs.filing_coverhseet_portrait")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.jobs.filing_coverhseet_portrait"),
             key: "filing_coverhseet_portrait",
             disabled: false,
           },
@@ -230,9 +191,9 @@ export const TemplateList = (type, context) => {
           appointment_confirmation: {
             title: i18n.t("printcenter.appointments.appointment_confirmation"),
             description: "Appointment Confirmation",
-            subject: `${i18n.t(
+            subject: i18n.t(
               "printcenter.appointments.appointment_confirmation"
-            )} - ${context && context.job && context.job.ro_number}`,
+            ),
             key: "appointment_confirmation",
             disabled: false,
           },
@@ -244,13 +205,12 @@ export const TemplateList = (type, context) => {
             title: i18n.t("printcenter.jobs.parts_order"),
             description: "Parts Order",
             key: "parts_order",
-            subject: `${bodyshop && bodyshop.shopname} Parts Order ${
-              (context && context.job && context.job.ro_number) || ""
-            }`,
+            subject: i18n.t("printcenter.jobs.parts_order"),
             disabled: false,
           },
           parts_return_slip: {
             title: i18n.t("printcenter.jobs.parts_return_slip"),
+            subject: i18n.t("printcenter.jobs.parts_return_slip"),
             description: "Parts Return",
             key: "parts_return_slip",
             disabled: false,
@@ -262,6 +222,7 @@ export const TemplateList = (type, context) => {
           payment_receipt: {
             title: i18n.t("printcenter.jobs.payment_receipt"),
             description: "Payment Receipt",
+            subject: i18n.t("printcenter.jobs.payment_receipt"),
             key: "payment_receipt",
             disabled: false,
           },
@@ -273,6 +234,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t("printcenter.jobs.csi_invitation"),
             description: "CSI invite",
             key: "csi_invitation",
+            subject: i18n.t("printcenter.jobs.csi_invitation"),
             disabled: false,
           },
         }
@@ -282,9 +244,7 @@ export const TemplateList = (type, context) => {
           payments_by_date_type: {
             title: i18n.t("reportcenter.templates.payments_by_date_type"),
             description: "Est Detail",
-            subject: `${i18n.t(
-              "reportcenter.templates.payments_by_date_type"
-            )} - ${context && context.job && context.job.ro_number}`,
+            subject: i18n.t("reportcenter.templates.payments_by_date_type"),
             key: "payments_by_date_type",
             disabled: false,
           },
@@ -293,9 +253,9 @@ export const TemplateList = (type, context) => {
               "reportcenter.templates.purchases_by_date_range_detail"
             ),
             description: "Est Detail",
-            subject: `${i18n.t(
+            subject: i18n.t(
               "reportcenter.templates.purchases_by_date_range_detail"
-            )} - ${context && context.job && context.job.ro_number}`,
+            ),
             key: "purchases_by_date_range_detail",
             disabled: false,
           },
@@ -304,27 +264,23 @@ export const TemplateList = (type, context) => {
               "reportcenter.templates.purchases_by_date_range_summary"
             ),
             description: "Est Detail",
-            subject: `${i18n.t(
+            subject: i18n.t(
               "reportcenter.templates.purchases_by_date_range_summary"
-            )} - ${context && context.job && context.job.ro_number}`,
+            ),
             key: "purchases_by_date_range_summary",
             disabled: false,
           },
           schedule: {
             title: i18n.t("reportcenter.templates.schedule"),
             description: "Est Detail",
-            subject: `${i18n.t("reportcenter.templates.schedule")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("reportcenter.templates.schedule"),
             key: "schedule",
             disabled: false,
           },
           timetickets: {
             title: i18n.t("reportcenter.templates.timetickets"),
             description: "Est Detail",
-            subject: `${i18n.t("reportcenter.templates.timetickets")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("reportcenter.templates.timetickets"),
             key: "timetickets",
             disabled: false,
           },
@@ -333,9 +289,9 @@ export const TemplateList = (type, context) => {
               "reportcenter.templates.purchases_by_vendor_detailed_date_range"
             ),
             description: "Est Detail",
-            subject: `${i18n.t(
+            subject: i18n.t(
               "reportcenter.templates.purchases_by_vendor_detailed_date_range"
-            )} - ${context && context.job && context.job.ro_number}`,
+            ),
             key: "purchases_by_vendor_detailed_date_range",
             idtype: "vendor",
             disabled: false,
@@ -345,9 +301,9 @@ export const TemplateList = (type, context) => {
               "reportcenter.templates.purchases_by_vendor_summary_date_range"
             ),
             description: "Est Detail",
-            subject: `${i18n.t(
+            subject: i18n.t(
               "reportcenter.templates.purchases_by_vendor_summary_date_range"
-            )} - ${context && context.job && context.job.ro_number}`,
+            ),
             key: "purchases_by_vendor_summary_date_range",
             idtype: "vendor",
             disabled: false,
@@ -361,18 +317,18 @@ export const TemplateList = (type, context) => {
               "printcenter.courtesycarcontract.courtesy_car_contract"
             ),
             description: "Est Detail",
-            subject: `${i18n.t(
+            subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_contract"
-            )} - ${context && context.job && context.job.ro_number}`,
+            ),
             key: "courtesy_car_contract",
             disabled: false,
           },
           courtesy_car_terms: {
             title: i18n.t("printcenter.courtesycarcontract.courtesy_car_terms"),
             description: "Est Detail",
-            subject: `${i18n.t(
+            subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_terms"
-            )} - ${context && context.job && context.job.ro_number}`,
+            ),
             key: "courtesy_car_terms",
             disabled: false,
           },
@@ -383,9 +339,7 @@ export const TemplateList = (type, context) => {
           inhouse_invoice: {
             title: i18n.t("printcenter.bills.inhouse_invoice"),
             description: "Est Detail",
-            subject: `${i18n.t("printcenter.bills.inhouse_invoice")} - ${
-              context && context.job && context.job.ro_number
-            }`,
+            subject: i18n.t("printcenter.bills.inhouse_invoice"),
             key: "inhouse_invoice",
             disabled: false,
           },
@@ -409,18 +363,14 @@ export const TemplateList = (type, context) => {
           purchases_by_vendor_detailed: {
             title: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
             description: "Est Detail",
-            subject: `${i18n.t(
-              "printcenter.vendors.purchases_by_vendor_detailed"
-            )} - ${context && context.job && context.job.ro_number}`,
+            subject: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
             key: "purchases_by_vendor_detailed",
             disabled: false,
           },
           purchases_by_vendor_summary: {
             title: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
             description: "Est Detail",
-            subject: `${i18n.t(
-              "printcenter.vendors.purchases_by_vendor_summary"
-            )} - ${context && context.job && context.job.ro_number}`,
+            subject: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
             key: "purchases_by_vendor_summary",
             disabled: false,
           },