diff --git a/frontend/express/public/core/app-management/templates/app-management.html b/frontend/express/public/core/app-management/templates/app-management.html
index bc8d1e80dbf..2f563a1131e 100644
--- a/frontend/express/public/core/app-management/templates/app-management.html
+++ b/frontend/express/public/core/app-management/templates/app-management.html
@@ -208,8 +208,10 @@ <h2 class="bu-mb-4" data-test-id="selected-app-name-title"> {{apps[selectedApp]
                                         <div class="bu-mr-0 bu-is-flex bu-is-justify-content-flex-end bu-is-align-items-center cly-vue-user-selected" style="height: 100%;">
                                             <span class="selected-count-blue bu-pl-1 text-medium">
                                                 <span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{compare(formScope.editedObject,apps[selectedApp]).length}}</span>
-                                                <span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
-                                                <span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
+                                                <span v-if="compare(formScope.editedObject,apps[selectedApp]).length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
+                                                <span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
+                                                <span v-if="compare(formScope.editedObject,apps[selectedApp]).length" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
+                                                <span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
                                             </span>
                                             <span class="vertical-divider bu-mr-4 bu-ml-4"></span>
                                             <el-button skin="red" class="bu-mr-2" size="small" type="default" @click="save(formScope.editedObject)">
diff --git a/frontend/express/public/localization/dashboard/dashboard.properties b/frontend/express/public/localization/dashboard/dashboard.properties
index 8463e8176c9..784caaa74ad 100644
--- a/frontend/express/public/localization/dashboard/dashboard.properties
+++ b/frontend/express/public/localization/dashboard/dashboard.properties
@@ -261,8 +261,10 @@ common.undo = Undo
 common.drawer.next-step = Next step
 common.drawer.previous-step = Previous step
 common.diff-helper.changes = You made {0} changes.
+common.diff-helper.changes-made-single = change has been made.
 common.diff-helper.changes-made = changes have been made.
 common.diff-helper.keep = Do you want to keep them?
+common.diff-helper.keep-single = Do you want to keep it?
 common.save-changes = Save Changes
 common.discard-changes = Discard
 common.complete = Complete
diff --git a/plugins/data-manager/frontend/public/javascripts/countly.models.js b/plugins/data-manager/frontend/public/javascripts/countly.models.js
index 8b74b639e63..a89ae48dc2b 100644
--- a/plugins/data-manager/frontend/public/javascripts/countly.models.js
+++ b/plugins/data-manager/frontend/public/javascripts/countly.models.js
@@ -442,6 +442,9 @@
                     if (res === 'EVENT_STATUS_UNPLANNED') {
                         CountlyHelpers.notify({message: CV.i18n('data-manager.error.event-visibility-error'), sticky: false, type: 'error'});
                     }
+                    else {
+                        CountlyHelpers.notify({message: CV.i18n('data-manager.success.visibility'), sticky: false, type: 'success'});
+                    }
                     context.dispatch('loadEventsData');
                     context.dispatch('loadSegmentsMap');
                 }).catch(function(e) {
@@ -452,17 +455,20 @@
             },
             deleteEvents: function(context, events) {
                 countlyDataManager.service.deleteEvents(events).then(function(res) {
-                    countlyDataManager.service.deleteEventsMeta(events).then(function(res2) {
-                        if (res === 'Error' || res2 === 'Error') {
-                            CountlyHelpers.notify({message: CV.i18n('data-manager.error.event-delete'), sticky: false, type: 'error'});
-                            return 'Error';
-                        }
-                        context.dispatch('loadEventsData');
-                        context.dispatch('loadSegmentsMap');
-                        CountlyHelpers.notify({message: CV.i18n('data-manager.success.event-delete'), sticky: false, type: 'success'});
-                    });
-                }).catch(function() {
-                    CountlyHelpers.notify({message: CV.i18n('data-manager.error.event-delete'), sticky: false, type: 'error'});
+                    if (res === 'Error') {
+                        CountlyHelpers.notify({message: CV.i18n('data-manager.error.event-delete'), sticky: false, type: 'error'});
+                        return 'Error';
+                    }
+                    context.dispatch('loadEventsData');
+                    context.dispatch('loadSegmentsMap');
+                    CountlyHelpers.notify({message: CV.i18n('data-manager.success.event-delete'), sticky: false, type: 'success'});
+                }).catch(function(e) {
+                    if (e.status === 504) {
+                        CountlyHelpers.notify({message: CV.i18n('data-manager.error.event-delete-timeout'), sticky: false, type: 'warning'});
+                    }
+                    else {
+                        CountlyHelpers.notify({message: CV.i18n('data-manager.error.event-delete'), sticky: false, type: 'error'});
+                    }
                 });
             },
             loadCategories: function(context) {
diff --git a/plugins/data-manager/frontend/public/localization/data-manager.properties b/plugins/data-manager/frontend/public/localization/data-manager.properties
index 85d6d34815d..4f6720b6205 100644
--- a/plugins/data-manager/frontend/public/localization/data-manager.properties
+++ b/plugins/data-manager/frontend/public/localization/data-manager.properties
@@ -331,6 +331,7 @@ data-manager.success.event-update = Event Updated
 data-manager.error.event-update = Error while updating event
 data-manager.success.event-delete = Event Deleted
 data-manager.error.event-delete = Error while deleting event
+data-manager.success.visibility = Visibility updated
 data-manager.success.category-create = Category Created
 data-manager.error.category-create = Error while creating category
 data-manager.success.category-update = Category Updated
diff --git a/plugins/plugins/frontend/public/javascripts/countly.views.js b/plugins/plugins/frontend/public/javascripts/countly.views.js
index 6407f6e8b4d..afc6582afa6 100644
--- a/plugins/plugins/frontend/public/javascripts/countly.views.js
+++ b/plugins/plugins/frontend/public/javascripts/countly.views.js
@@ -1211,6 +1211,7 @@
                 "big_list_limit": true,
                 "record_big_list": true,
                 "cache_threshold": true,
+                "use_union_with": true,
                 "correct_estimation": true,
                 "custom_property_limit": true,
                 "list_limit": true,
diff --git a/plugins/plugins/frontend/public/templates/configurations.html b/plugins/plugins/frontend/public/templates/configurations.html
index 30733745524..8b5765b6a61 100755
--- a/plugins/plugins/frontend/public/templates/configurations.html
+++ b/plugins/plugins/frontend/public/templates/configurations.html
@@ -301,8 +301,10 @@ <h3 v-if="config.groups.length > 1 || group.label" class="bu-my-4">
                 <div class="bu-mr-0 bu-is-flex bu-is-justify-content-flex-end bu-is-align-items-center cly-vue-user-selected" style="height: 100%;">
                     <span class="selected-count-blue bu-pl-1 text-medium">
                         <span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{diff.length}}</span>
-                        <span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
-                        <span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
+                        <span v-if="diff.length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
+                        <span v-elseclass="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
+                        <span v-if="diff.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
+                        <span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
                     </span>
                     <span class="vertical-divider bu-mr-4 bu-ml-4"></span>
                     <el-button skin="red" class="bu-mr-2" size="small" type="default" @click="save">
diff --git a/plugins/plugins/frontend/public/templates/plugins.html b/plugins/plugins/frontend/public/templates/plugins.html
index a9dcc99d720..559a99fd506 100644
--- a/plugins/plugins/frontend/public/templates/plugins.html
+++ b/plugins/plugins/frontend/public/templates/plugins.html
@@ -44,8 +44,10 @@
                             <div class="bu-mr-0 bu-is-flex bu-is-justify-content-flex-end bu-is-align-items-center cly-vue-user-selected" style="height: 100%;">
                                 <span class="selected-count-blue bu-pl-1 text-medium">
                                     <span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{scope.diff.length}}</span>
-                                    <span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
-                                    <span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
+                                    <span v-if="scope.diff.length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
+                                    <span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
+                                    <span v-if="scope.diff.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
+                                    <span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
                                 </span>
                                 <span class="vertical-divider bu-mr-4 bu-ml-4"></span>
                                 <el-button skin="red" class="bu-mr-2" size="small" type="default" @click="updateStatus(scope)">