diff --git a/queries/analytics/event/saveEvent.js b/queries/analytics/event/saveEvent.js
index 1122dfcf..3bb3b0bf 100644
--- a/queries/analytics/event/saveEvent.js
+++ b/queries/analytics/event/saveEvent.js
@@ -39,7 +39,7 @@ async function relationalQuery(data) {
 }
 
 async function clickhouseQuery(data) {
-  const { websiteId, sessionId, url, eventName, eventData } = data;
+  const { websiteId, id: sessionId, url, eventName, eventData, country, ...args } = data;
   const { getDateFormat, sendMessage } = kafka;
   const website = await cache.fetchWebsite(websiteId);
 
@@ -52,6 +52,8 @@ async function clickhouseQuery(data) {
     event_data: eventData ? JSON.stringify(eventData) : null,
     rev_id: website?.revId || 0,
     created_at: getDateFormat(new Date()),
+    country: country ? country : null,
+    ...args,
   };
 
   await sendMessage(params, 'event');
diff --git a/queries/analytics/pageview/savePageView.js b/queries/analytics/pageview/savePageView.js
index 7aedf6d2..adcb4b3f 100644
--- a/queries/analytics/pageview/savePageView.js
+++ b/queries/analytics/pageview/savePageView.js
@@ -26,7 +26,7 @@ async function relationalQuery(data) {
 }
 
 async function clickhouseQuery(data) {
-  const { websiteId, sessionId, url, referrer } = data;
+  const { websiteId, id: sessionId, url, referrer, country, ...args } = data;
   const website = await cache.fetchWebsite(websiteId);
   const { getDateFormat, sendMessage } = kafka;
 
@@ -37,6 +37,8 @@ async function clickhouseQuery(data) {
     referrer: referrer?.substring(0, URL_LENGTH),
     rev_id: website?.revId || 0,
     created_at: getDateFormat(new Date()),
+    country: country ? country : null,
+    ...args,
   };
 
   await sendMessage(msg, 'event');