diff --git a/pages/api/auth/login.ts b/pages/api/auth/login.ts
index 4a0ff4cf..0e226346 100644
--- a/pages/api/auth/login.ts
+++ b/pages/api/auth/login.ts
@@ -47,7 +47,7 @@ export default async (
         return ok(res, { token, user });
       }
 
-      const token = createSecureToken(user.id, secret());
+      const token = createSecureToken({ userId: user.id }, secret());
 
       return ok(res, { token, user });
     }
diff --git a/queries/analytics/event/saveEvent.ts b/queries/analytics/event/saveEvent.ts
index 6b7b7a03..60f5348f 100644
--- a/queries/analytics/event/saveEvent.ts
+++ b/queries/analytics/event/saveEvent.ts
@@ -53,7 +53,24 @@ async function relationalQuery(data: {
   });
 }
 
-async function clickhouseQuery(data) {
+async function clickhouseQuery(data: {
+  id: string;
+  websiteId: string;
+  url: string;
+  referrer?: string;
+  pageTitle?: string;
+  eventName?: string;
+  hostname?: string;
+  browser?: string;
+  os?: string;
+  device?: string;
+  screen?: string;
+  language?: string;
+  country?: string;
+  subdivision1?: string;
+  subdivision2?: string;
+  city?: string;
+}) {
   const {
     websiteId,
     id: sessionId,
diff --git a/queries/analytics/pageview/savePageView.ts b/queries/analytics/pageview/savePageView.ts
index c0e31f7c..24f45b5e 100644
--- a/queries/analytics/pageview/savePageView.ts
+++ b/queries/analytics/pageview/savePageView.ts
@@ -50,7 +50,23 @@ async function relationalQuery(data: {
   });
 }
 
-async function clickhouseQuery(data) {
+async function clickhouseQuery(data: {
+  id: string;
+  websiteId: string;
+  url: string;
+  referrer?: string;
+  pageTitle?: string;
+  hostname?: string;
+  browser?: string;
+  os?: string;
+  device?: string;
+  screen?: string;
+  language?: string;
+  country?: string;
+  subdivision1?: string;
+  subdivision2?: string;
+  city?: string;
+}) {
   const {
     websiteId,
     id: sessionId,
diff --git a/tracker/index.js b/tracker/index.js
index dd43eb17..f5765dc7 100644
--- a/tracker/index.js
+++ b/tracker/index.js
@@ -72,6 +72,12 @@
   let currentPageTitle = document.title;
   let cache;
 
+  if (currentRef.substring(0, 4) === 'http') {
+    if ((currentRef = currentRef.split('/')[2].split(':')[0] === hostname)) {
+      currentRef = '/' + currentRef.split('/').splice(3).join('/');
+    }
+  }
+
   /* Collect metrics */
 
   const getPayload = () => ({