diff --git a/frappe/__init__.py b/frappe/__init__.py
index 5f2ff76529..1cada6c63a 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.0.24'
+__version__ = '10.0.25'
 __title__ = "Frappe Framework"
 
 local = Local()
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index 1350d132df..21daaa3022 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -714,10 +714,10 @@ def get_max_email_uid(email_account):
 		"communication_medium": "Email",
 		"sent_or_received": "Received",
 		"email_account": email_account
-	}, fields=["ifnull(max(uid), 0) as uid"])
+	}, fields=["max(uid) as uid"])
 
 	if not result:
 		return 1
 	else:
-		max_uid = int(result[0].get("uid", 0)) + 1
+		max_uid = cint(result[0].get("uid", 0)) + 1
 		return max_uid
diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 1cdb7922af..609cd8be80 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -192,7 +192,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 	get_results: function() {
 		let me = this;
 
-		let filters = this.get_query().filters;
+		let filters = this.get_query ? this.get_query().filters : {};
 		Object.keys(this.setters).forEach(function(setter) {
 			filters[setter] = me.dialog.fields_dict[setter].get_value() || undefined;
 			me.args[setter] = filters[setter];
@@ -209,7 +209,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			filters: filters,
 			filter_fields: Object.keys(me.setters).concat([me.date_field]),
 			page_length: this.page_length + 1,
-			query: this.get_query().query,
+			query: this.get_query ? this.get_query().query : '',
 			as_dict: 1
 		}
 		frappe.call({
diff --git a/frappe/public/js/frappe/ui/tags.js b/frappe/public/js/frappe/ui/tags.js
index 569f91c125..23908c3144 100644
--- a/frappe/public/js/frappe/ui/tags.js
+++ b/frappe/public/js/frappe/ui/tags.js
@@ -109,14 +109,14 @@ frappe.ui.Tags = class {
 	}
 
 	getTag(label) {
-		let $tag = $(`<div class="frappe-tag btn-group" data-tag-label=${label}>
+		let $tag = $(`<div class="frappe-tag btn-group" data-tag-label="${label}">
 		<button class="btn btn-default btn-xs toggle-tag"
 			title="${ __("toggle Tag") }"
-			data-tag-label=${label}>${label}
+			data-tag-label="${label}">${label}
 		</button>
 		<button class="btn btn-default btn-xs remove-tag"
 			title="${ __("Remove Tag") }"
-			data-tag-label=${label}>
+			data-tag-label="${label}">
 			<i class="fa fa-remove text-muted"></i>
 		</button></div>`);