diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index c79a474da..a0a61b7f4 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -34,8 +34,10 @@ export async function getDirectNavigation(toRoute) {
     // vehicle -> vehicle-damage
     // quote -> vin-lookup/estimate
     // insurance-company -> vin-lookup/estimate
-    if (store.getters.payment?.insuranceCoverage?.isVerified ||
-        store.getters.order?.referralNumber?.length === 6) {
+    if (
+        store.getters.payment?.insuranceCoverage?.isVerified ||
+        store.getters.order?.referralNumber?.length === 6
+    ) {
         if (fmgPageValue === fmgPageValues.VEHICLE) {
             return fmgPageValues.VEHICLE_DAMAGE;
         }
@@ -109,7 +111,7 @@ export async function getImplicitNavigation(toRoute) {
 
 export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog }) {
     const log = getQuerystringParameter(queryStrings.LOG);
-    if (eval(log)) {
+    if (log === "true") {
         console.log("------------- Navigate to heritage start -----------------");
         console.log(new Date() + " applicationConfig: " + JSON.stringify(applicationConfig));
         console.log(new Date() + " navigateToHeritageFunnel: " + applicationConfig.HERITAGE_FUNNEL);
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 3f0da0131..a2ed0f542 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -348,7 +348,7 @@ export default {
             // prettier-ignore
             {
                 const log = getQuerystringParameter(queryStrings.LOG);
-                if (eval(log)) {
+                if (log === "true") {
                     console.log("------------- quote.vue thresholds start -----------------");
                     console.log(new Date() + " isExternalParameter: " + isExternalParameter);
                     console.log(new Date() + " internalThreshold: " + internalThreshold);
@@ -466,7 +466,7 @@ export default {
             // prettier-ignore
             {
                 const log = getQuerystringParameter(queryStrings.LOG);
-                if (eval(log) || !preReqResult) {
+                if (log === "true" || !preReqResult) {
                     console.log("------------- quote.vue pagePrereqs start -----------------");
                     console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + store.getters.order.serviceLocation?.zipCode);
                     console.log(new Date() +" store.getters.order.serviceLocation.zipCodeCtu: " + store.getters.order.serviceLocation?.zipCodeCtu);
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 5af963d06..7800876cd 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -326,7 +326,7 @@ export default {
             // prettier-ignore
             {
                 const log = getQuerystringParameter(queryStrings.LOG);
-                if (eval(log) || !preReqResult) {
+                if (log === "true" || !preReqResult) {
                     console.log("------------- schedule.vue pagePrereqs start -----------------");
                     console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + serviceLocation.zipCode);
                     console.log(new Date() + " store.getters.order.serviceLocation.zipCodeCtu: " + serviceLocation.zipCodeCtu);
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 931a8f23f..18eee6988 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -122,7 +122,7 @@ export default {
 
     async beforeRouteEnter(to, from, next) {
         const log = getQuerystringParameter(queryStrings.LOG);
-        if (eval(log)) {
+        if (log === "true") {
             console.log("----------------- applicationConfig start -----------------");
             console.log(new Date() + JSON.stringify(applicationConfig));
             console.log("----------------- applicationConfig end -----------------");
diff --git a/src/router/index.js b/src/router/index.js
index 1f83ee9d3..29971bb0a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -466,9 +466,9 @@ async function navigate(
         log("------------- router index.js navigate start -----------------");
         log(" --scenario: ", scenario);
         log(" --isSavingNavigation: ", isSavingNavigation);
-        log(" --optionalQuery: ", JSON.stringify(optionalQuery));
-        log(" --optionalParams: ", JSON.stringify(optionalParams));
-        log(" --optionalPageData: ", JSON.stringify(optionalPageData));
+        log(" --optionalQuery: ", optionalQuery);
+        log(" --optionalParams: ", optionalParams);
+        log(" --optionalPageData: ", optionalPageData);
         log(" --nextPageName: ", nextPageName);
 
         if (
@@ -493,7 +493,7 @@ async function navigate(
             queryStringsObject[queryStrings.LOG] = logQs;
         }
 
-        log(" querystrings: ", JSON.stringify(queryStringsObject));
+        log(" querystrings: ", queryStringsObject);
         log("------------- router index.js navigate end -----------------");
 
         router.push({
@@ -524,9 +524,10 @@ function getNavigationMap(scenario, currentRoute) {
 function log(message, data) {
     const log = getQuerystringParameter(queryStrings.LOG);
     data = data ?? "";
+    const outData = typeof data === "object" ? JSON.stringify(data) : data;
 
-    if (eval(log)) {
-        console.log(new Date() + message + data);
+    if (log === "true") {
+        console.log(new Date() + message + outData);
     }
 }