diff --git a/client/package.json b/client/package.json
index 6efc2288f..5296db24a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -8,6 +8,7 @@
     "@asseinfo/react-kanban": "^2.2.0",
     "@craco/craco": "^6.4.3",
     "@fingerprintjs/fingerprintjs": "^3.3.3",
+    "@jsreport/browser-client": "^3.1.0",
     "@sentry/react": "^7.1.1",
     "@sentry/tracing": "^7.1.1",
     "@splitsoftware/splitio-react": "^1.4.1",
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 2fb735827..56868b9c6 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -229,9 +229,16 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 label={t("vehicles.fields.v_paint_codes", { number: "" })}
               >
                 <span style={{ whiteSpace: "pre" }}>
-                  {Object.keys(job.vehicle.v_paint_codes).map((key, idx) => (
-                    <Tag key={idx}>{job.vehicle.v_paint_codes[key]}</Tag>
-                  ))}
+                  {Object.keys(job.vehicle.v_paint_codes)
+                    .filter(
+                      (key) =>
+                        job.vehicle.v_paint_codes[key] !== "" &&
+                        job.vehicle.v_paint_codes[key] !== null &&
+                        job.vehicle.v_paint_codes[key] !== undefined
+                    )
+                    .map((key, idx) => (
+                      <Tag key={idx}>{job.vehicle.v_paint_codes[key]}</Tag>
+                    ))}
                 </span>
               </DataLabel>
             )}
diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index f51b81060..c6d4a0ea9 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -1,7 +1,7 @@
 import { gql } from "@apollo/client";
 import { notification } from "antd";
 import axios from "axios";
-import jsreport from "jsreport-browser-client-dist";
+import jsreport from "@jsreport/browser-client";
 import _ from "lodash";
 import moment from "moment";
 import { auth } from "../firebase/firebase.utils";
@@ -9,7 +9,9 @@ import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
 import { TemplateList } from "./TemplateConstants";
+
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
+
 jsreport.serverUrl = server;
 
 const Templates = TemplateList();
@@ -21,6 +23,10 @@ export default async function RenderTemplate(
   renderAsExcel = false,
   renderAsText = false
 ) {
+  if (window.jsr3) {
+    jsreport.serverUrl = "https://reports3.test.imex.online/";
+  }
+
   //Query assets that match the template name. Must be in format <<templateName>>.query
   let { contextData, useShopSpecificTemplate } = await fetchContextData(
     templateObject
@@ -69,7 +75,7 @@ export default async function RenderTemplate(
   };
 
   try {
-    const render = await jsreport.renderAsync(reportRequest);
+    const render = await jsreport.render(reportRequest);
 
     if (!renderAsHtml) {
       render.download(
@@ -104,7 +110,7 @@ export default async function RenderTemplate(
           },
         };
 
-        const pdfRender = await jsreport.renderAsync(pdfRequest);
+        const pdfRender = await jsreport.render(pdfRequest);
         pdf = pdfRender.toDataURI();
       }
       return new Promise((resolve, reject) => {
@@ -152,6 +158,9 @@ export async function RenderTemplates(
   //     (template) => template.name === item.templateObject.name
   //   );
   // });
+  if (window.jsr3) {
+    jsreport.serverUrl = "https://reports3.test.imex.online/";
+  }
 
   unsortedTemplatesAndData.sort(function (a, b) {
     return (
@@ -242,7 +251,7 @@ export async function RenderTemplates(
   };
 
   try {
-    const render = await jsreport.renderAsync(reportRequest);
+    const render = await jsreport.render(reportRequest);
     if (!renderAsHtml) {
       render.download("Speed Print");
     } else {
diff --git a/client/yarn.lock b/client/yarn.lock
index 9d23a0a14..2b581592d 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1918,6 +1918,11 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
+"@jsreport/browser-client@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jsreport/browser-client/-/browser-client-3.1.0.tgz#a84011087ca8a29a6dc6a852fa05ffaf1983a679"
+  integrity sha512-ZElwn2KRIzkUzAyD5UKGxULZUhokWuPOlMzrmiur4WirqH3yoiHlOJEdnRGkjjE/fhZzCR8gBFZ/TuOW/fsOIw==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"