diff --git a/api/parts/data/fetch.js b/api/parts/data/fetch.js
index c94f20bb422..210c277571a 100644
--- a/api/parts/data/fetch.js
+++ b/api/parts/data/fetch.js
@@ -1323,7 +1323,7 @@ fetch.fetchEvents = function(params) {
 */
 fetch.fetchTimeObj = function(collection, params, isCustomEvent, options) {
     fetchTimeObj(collection, params, isCustomEvent, options, function(output) {
-        if (params?.qstring?.event) {
+        if (params.qstring?.event) {
             output.eventName = params.qstring.event;
         }
         common.returnOutput(params, output);
diff --git a/frontend/express/public/core/events/javascripts/countly.details.models.js b/frontend/express/public/core/events/javascripts/countly.details.models.js
index 13c4af6a146..e5bf4564360 100644
--- a/frontend/express/public/core/events/javascripts/countly.details.models.js
+++ b/frontend/express/public/core/events/javascripts/countly.details.models.js
@@ -1077,7 +1077,7 @@
                                                         .then(function(resp) {
                                                             if (resp) {
                                                                 context.commit("setSelectedEventsOverview", countlyAllEvents.helpers.getSelectedEventsOverview(context, resp) || {});
-                                                                context.commit("setLegendData", countlyAllEvents.helpers.getLegendData(context || {}));
+                                                                context.commit("setLegendData", countlyAllEvents.helpers.getLegendData(context));
                                                             }
                                                         });
                                                 }
diff --git a/frontend/express/public/core/events/javascripts/countly.overview.models.js b/frontend/express/public/core/events/javascripts/countly.overview.models.js
index 1eb01e5ccfa..8937d9a97a0 100644
--- a/frontend/express/public/core/events/javascripts/countly.overview.models.js
+++ b/frontend/express/public/core/events/javascripts/countly.overview.models.js
@@ -107,9 +107,9 @@
             return monitorData;
         },
         getOverviewConfigureList: function(eventsList, groupList) {
-            var map = eventsList.map || {};
             var allEvents = [];
             if (eventsList && eventsList.list) {
+                var map = eventsList.map || {};
                 eventsList.list.forEach(function(item) {
                     if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
                         var label;
@@ -141,9 +141,9 @@
             return allEvents;
         },
         getEventMapping: function(eventsList, groupList) {
-            var map = eventsList.map || {};
             var mapping = {};
             if (eventsList && eventsList.list) {
+                var map = eventsList.map || {};
                 eventsList.list.forEach(function(item) {
                     var obj = {
                         "eventKey": item,
diff --git a/plugins/alerts/frontend/public/javascripts/countly.views.js b/plugins/alerts/frontend/public/javascripts/countly.views.js
index 3147a38370c..1ba08964aa4 100644
--- a/plugins/alerts/frontend/public/javascripts/countly.views.js
+++ b/plugins/alerts/frontend/public/javascripts/countly.views.js
@@ -992,10 +992,10 @@
 
 
                     if (newState.alertBy === "email") {
-                        if (newState?.allGroups?.length) {
+                        if (newState.allGroups?.length) {
                             this.selectedRadioButton = "toGroup";
                         }
-                        if (newState?.alertValues?.length) {
+                        if (newState.alertValues?.length) {
                             this.selectedRadioButton = "specificAddress";
                         }
                     }
diff --git a/plugins/compare/frontend/public/javascripts/countly.models.js b/plugins/compare/frontend/public/javascripts/countly.models.js
index b9f3fbc2691..49a3c328a16 100644
--- a/plugins/compare/frontend/public/javascripts/countly.models.js
+++ b/plugins/compare/frontend/public/javascripts/countly.models.js
@@ -201,9 +201,9 @@
             return lineLegend;
         },
         getAllEventsList: function(eventsList, groupList) {
-            var map = eventsList.map || {};
             var allEvents = [];
             if (eventsList) {
+                var map = eventsList.map || {};
                 eventsList.list.forEach(function(item) {
                     if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
                         var label;
@@ -245,9 +245,9 @@
             return obj;
         },
         getTableStateMap: function(eventsList, groupList) {
-            var map = eventsList.map || {};
             var allEvents = {};
             if (eventsList) {
+                var map = eventsList.map || {};
                 eventsList.list.forEach(function(item) {
                     if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
                         allEvents[countlyCompareEvents.helpers.decode(item)] = true;