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 2f563a1131e..90f82ff8230 100644
--- a/frontend/express/public/core/app-management/templates/app-management.html
+++ b/frontend/express/public/core/app-management/templates/app-management.html
@@ -210,7 +210,7 @@ <h2 class="bu-mb-4" data-test-id="selected-app-name-title"> {{apps[selectedApp]
                                                 <span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{compare(formScope.editedObject,apps[selectedApp]).length}}</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-if="compare(formScope.editedObject,apps[selectedApp]).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>
@@ -391,8 +391,10 @@ <h3 class="bu-mb-2" v-if="!newApp && hasAppAdminRights">{{i18n('management-appli
                                 <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;">{{changeKeys.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="changeKeys.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="changeKeys.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="saveSettings">
diff --git a/plugins/crashes/frontend/public/javascripts/countly.views.js b/plugins/crashes/frontend/public/javascripts/countly.views.js
index 542b5a96db3..58f60fb34ed 100644
--- a/plugins/crashes/frontend/public/javascripts/countly.views.js
+++ b/plugins/crashes/frontend/public/javascripts/countly.views.js
@@ -605,7 +605,33 @@
                     promise = this.$store.dispatch("countlyCrashes/overview/setSelectedAsShown", this.$data.selectedCrashgroups);
                 }
                 else if (state === "delete") {
-                    promise = this.$store.dispatch("countlyCrashes/overview/setSelectedAsDeleted", this.$data.selectedCrashgroups);
+                    CountlyHelpers.confirm(jQuery.i18n.prop("crashes.confirm-delete", 1), "red", function(result) {
+                        if (result) {
+                            self.$store.dispatch("countlyCrashes/overview/setSelectedAsDeleted", self.$data.selectedCrashgroups)
+                                .then(function(response) {
+                                    if (Array.isArray(response.result)) {
+                                        var itemList = response.result.reduce(function(acc, curr) {
+                                            acc += "<li>" + curr + "</li>";
+                                            return acc;
+                                        }, "");
+                                        CountlyHelpers.alert("<ul>" + itemList + "</ul>", "red", { title: CV.i18n("crashes.alert-fails") });
+                                    }
+                                    else {
+                                        CountlyHelpers.notify({
+                                            title: jQuery.i18n.map["systemlogs.action.crash_deleted"],
+                                            message: jQuery.i18n.map["systemlogs.action.crash_deleted"]
+                                        });
+                                    }
+                                }).finally(function() {
+                                    // Reset selection if command is delete or hide
+                                    // if (["delete", "hide"].includes(state)) {
+                                    self.selectedCrashgroups = [];
+                                    self.$refs.dataTable.$refs.elTable.clearSelection();
+                                    // }
+                                });
+                        }
+                    });
+
                 }
 
                 if (typeof promise !== "undefined") {
diff --git a/plugins/data-manager/frontend/public/javascripts/countly.views.js b/plugins/data-manager/frontend/public/javascripts/countly.views.js
index eb8b81067d2..6ef242534c5 100644
--- a/plugins/data-manager/frontend/public/javascripts/countly.views.js
+++ b/plugins/data-manager/frontend/public/javascripts/countly.views.js
@@ -782,6 +782,7 @@
                     var delKey = row.key || row.e || row.name;
                     events.push(delKey);
                 });
+                this.unpatchSelectedEvents();
                 this.$store.dispatch('countlyDataManager/deleteEvents', events).then(function() {
                     countlyEvent.refreshEvents();
                 });
diff --git a/plugins/plugins/frontend/public/templates/configurations.html b/plugins/plugins/frontend/public/templates/configurations.html
index 8b5765b6a61..7af8f6bc88e 100755
--- a/plugins/plugins/frontend/public/templates/configurations.html
+++ b/plugins/plugins/frontend/public/templates/configurations.html
@@ -302,7 +302,7 @@ <h3 v-if="config.groups.length > 1 || group.label" class="bu-my-4">
                     <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 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-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="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>