diff --git a/queries/analytics/event/getEventMetrics.ts b/queries/analytics/event/getEventMetrics.ts
index 12efd6b24..c2bf2c086 100644
--- a/queries/analytics/event/getEventMetrics.ts
+++ b/queries/analytics/event/getEventMetrics.ts
@@ -86,7 +86,7 @@ async function relationalQuery(
                   ],
                 },
                 {
-                  lte: [
+                  $lte: [
                     '$created_at',
                     {
                       $dateFromString: {
diff --git a/queries/analytics/eventData/getEventData.ts b/queries/analytics/eventData/getEventData.ts
index e06a567db..5b1f7930e 100644
--- a/queries/analytics/eventData/getEventData.ts
+++ b/queries/analytics/eventData/getEventData.ts
@@ -114,7 +114,7 @@ async function relationalQuery(
                   ],
                 },
                 {
-                  lte: [
+                  $lte: [
                     '$created_at',
                     {
                       $dateFromString: {
diff --git a/queries/analytics/eventData/saveEventData.ts b/queries/analytics/eventData/saveEventData.ts
index 90e635656..af6f2ace0 100644
--- a/queries/analytics/eventData/saveEventData.ts
+++ b/queries/analytics/eventData/saveEventData.ts
@@ -30,7 +30,9 @@ async function relationalQuery(data: {
   const { websiteId, eventId, eventData } = data;
 
   const jsonKeys = flattenJSON(eventData);
-
+  if (jsonKeys.length == 0) {
+    return Promise.resolve({ count: 0 });
+  }
   //id, websiteEventId, eventStringValue
   const flattendData = jsonKeys.map(a => ({
     id: uuid(),
diff --git a/queries/analytics/pageview/getPageviewMetrics.ts b/queries/analytics/pageview/getPageviewMetrics.ts
index 8f819396f..b7133833c 100644
--- a/queries/analytics/pageview/getPageviewMetrics.ts
+++ b/queries/analytics/pageview/getPageviewMetrics.ts
@@ -90,7 +90,7 @@ async function relationalQuery(
                   ],
                 },
                 {
-                  lte: [
+                  $lte: [
                     '$created_at',
                     {
                       $dateFromString: {
diff --git a/queries/analytics/pageview/getPageviewStats.ts b/queries/analytics/pageview/getPageviewStats.ts
index 2055391aa..a6847ea7e 100644
--- a/queries/analytics/pageview/getPageviewStats.ts
+++ b/queries/analytics/pageview/getPageviewStats.ts
@@ -105,7 +105,7 @@ async function relationalQuery(
                   ],
                 },
                 {
-                  lte: [
+                  $lte: [
                     '$created_at',
                     {
                       $dateFromString: {
diff --git a/queries/analytics/session/getSessionMetrics.ts b/queries/analytics/session/getSessionMetrics.ts
index bba0280a7..72d8ce709 100644
--- a/queries/analytics/session/getSessionMetrics.ts
+++ b/queries/analytics/session/getSessionMetrics.ts
@@ -59,7 +59,7 @@ async function relationalQuery(
                   ],
                 },
                 {
-                  lte: [
+                  $lte: [
                     '$created_at',
                     {
                       $dateFromString: {
diff --git a/queries/analytics/stats/getWebsiteStats.ts b/queries/analytics/stats/getWebsiteStats.ts
index 696837fc8..dbe43b5cd 100644
--- a/queries/analytics/stats/getWebsiteStats.ts
+++ b/queries/analytics/stats/getWebsiteStats.ts
@@ -70,7 +70,7 @@ async function relationalQuery(
                   ],
                 },
                 {
-                  lte: [
+                  $lte: [
                     '$created_at',
                     {
                       $dateFromString: {