diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index 4b19a3eb0..8e29be5b0 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -8,11 +8,11 @@ import TrpcProvider from "@/lib/trpc/Provider"
 
 import TokenRefresher from "@/components/Auth/TokenRefresher"
 import CookieBotConsent from "@/components/CookieBot"
-import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
-import GTMScript from "@/components/Current/GTMScript"
 import VwoScript from "@/components/Current/VwoScript"
 import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
 import { preloadUserTracking } from "@/components/TrackingSDK"
+import AdobeSDKScript from "@/components/TrackingSDK/AdobeSDKScript"
+import GTMScript from "@/components/TrackingSDK/GTMScript"
 import RouterTracking from "@/components/TrackingSDK/RouterTracking"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
diff --git a/app/[lang]/webview/layout.tsx b/app/[lang]/webview/layout.tsx
index 59291b505..917898ee4 100644
--- a/app/[lang]/webview/layout.tsx
+++ b/app/[lang]/webview/layout.tsx
@@ -5,8 +5,8 @@ import Script from "next/script"
 
 import TrpcProvider from "@/lib/trpc/Provider"
 
-import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
-import GTMScript from "@/components/Current/GTMScript"
+import AdobeSDKScript from "@/components/TrackingSDK/AdobeSDKScript"
+import GTMScript from "@/components/TrackingSDK/GTMScript"
 import RouterTracking from "@/components/TrackingSDK/RouterTracking"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
diff --git a/components/Current/AdobeSDKScript.tsx b/components/TrackingSDK/AdobeSDKScript.tsx
similarity index 100%
rename from components/Current/AdobeSDKScript.tsx
rename to components/TrackingSDK/AdobeSDKScript.tsx
diff --git a/components/Current/GTMScript.tsx b/components/TrackingSDK/GTMScript.tsx
similarity index 100%
rename from components/Current/GTMScript.tsx
rename to components/TrackingSDK/GTMScript.tsx
diff --git a/components/TrackingSDK/RouterTransition.tsx b/components/TrackingSDK/RouterTransition.tsx
index dae5ae605..020cfe430 100644
--- a/components/TrackingSDK/RouterTransition.tsx
+++ b/components/TrackingSDK/RouterTransition.tsx
@@ -98,12 +98,12 @@ export default function RouterTransition({
           pageLoadTime: getPageLoadTime(),
         }
         const pageObject = createSDKPageObject(trackingData)
-        // console.log(
-        //   "TRACKING: Tracking RouterTransition pageViewEnd",
-        //   pageObject
-        // )
-        // console.log("TRACKING: Tracking RouterTransition userData", userData)
-        // console.log("TRACKING: Tracking RouterTransition hotelInfo", hotelInfo)
+        console.log(
+          "TRACKING: Tracking RouterTransition pageViewEnd",
+          pageObject
+        )
+        console.log("TRACKING: Tracking RouterTransition userData", userData)
+        console.log("TRACKING: Tracking RouterTransition hotelInfo", hotelInfo)
         window.adobeDataLayer.push({
           event: "pageViewEnd",
           pageInfo: pageObject,
diff --git a/env/server.ts b/env/server.ts
index 73433f811..46adf2ae5 100644
--- a/env/server.ts
+++ b/env/server.ts
@@ -18,7 +18,7 @@ export const env = createEnv({
       .refine((s) => s === "true" || s === "false")
       // transform to boolean
       .transform((s) => s === "true")
-      .optional(),
+      .default("false"),
     API_BASEURL: z.string(),
     BUILD_ID: z.string().default("64rYXBu8o2eHp0Jf"),
     CMS_ACCESS_TOKEN: z.string(),
diff --git a/utils/tracking.ts b/utils/tracking.ts
index 6f0f9ddaf..f66a202dd 100644
--- a/utils/tracking.ts
+++ b/utils/tracking.ts
@@ -53,5 +53,6 @@ export function createSDKPageObject(
 }
 
 function convertSlashToPipe(url: string) {
-  return url?.split("/").slice(1).join("|") ?? ""
+  const formattedUrl = url.startsWith("/") ? url.slice(1) : url
+  return formattedUrl.replaceAll("/", "|")
 }