diff --git a/frappe/desk/doctype/tag/tag.py b/frappe/desk/doctype/tag/tag.py
index ca26789d4d..8711b190f3 100644
--- a/frappe/desk/doctype/tag/tag.py
+++ b/frappe/desk/doctype/tag/tag.py
@@ -152,7 +152,7 @@ def get_deleted_tags(new_tags, existing_tags):
 	return list(set(existing_tags) - set(new_tags))
 
 def delete_tag_for_document(dt, dn, tag):
-	frappe.db.sql("""DELETE FROM `tabTag Link` WHERE `document_type`=%s, `document_name`=%s, tag=%s""", (dt, dn, tag))
+	frappe.db.sql("""DELETE FROM `tabTag Link` WHERE `document_type`=%s AND `document_name`=%s AND tag=%s""", (dt, dn, tag))
 
 @frappe.whitelist()
 def get_documents_for_tag(tag):
diff --git a/frappe/public/build.json b/frappe/public/build.json
index 343acde05d..c59df8034c 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -186,7 +186,7 @@
 		"public/js/frappe/ui/toolbar/awesome_bar.js",
 		"public/js/frappe/ui/toolbar/energy_points_notifications.js",
 		"public/js/frappe/ui/toolbar/search.js",
-		"public/js/frappe/ui/toolbar/tags.js",
+		"public/js/frappe/ui/toolbar/tag_utils.js",
 		"public/js/frappe/ui/toolbar/search.html",
 		"public/js/frappe/ui/toolbar/search_header.html",
 		"public/js/frappe/ui/toolbar/search_utils.js",
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index d75b50e05c..88a3ba9803 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -603,7 +603,7 @@ frappe.Application = Class.extend({
 	},
 
 	fetch_tags() {
-		frappe.tags.utils.set_tags();
+		frappe.tags.utils.fetch_tags();
 	}
 });
 
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 19079e1c24..ac6511fcd6 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -432,7 +432,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 			tag_editor.wrapper.on('click', '.tagit-label', (e) => {
 				const $this = $(e.currentTarget);
-				this.filter_area.add(this.doctype, '_user_tags', '=', $this.text());
+				this.filter_area.add('Tag Link', 'tag', '=', $this.text());
 			});
 		});
 	}
diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index c953b221c4..2a99253b11 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -174,8 +174,10 @@ frappe.ui.Filter = class {
 
 		let original_docfield = (this.fieldselect.fields_by_name[doctype] || {})[fieldname];
 
-		if (doctype === "Tag Link") {
-			original_docfield = {fieldname: "tag", fieldtype: "Data", label: "Tags", parent: doctype};
+		if (doctype === "Tag Link" || fieldname === "_user_tags") {
+			original_docfield = {fieldname: "tag", fieldtype: "Data", label: "Tags", parent: "Tag Link"};
+			doctype = "Tag Link";
+			condition = "=";
 		}
 
 		if(!original_docfield) {
diff --git a/frappe/public/js/frappe/ui/tag_editor.js b/frappe/public/js/frappe/ui/tag_editor.js
index 5811714bb5..bf5844e790 100644
--- a/frappe/public/js/frappe/ui/tag_editor.js
+++ b/frappe/public/js/frappe/ui/tag_editor.js
@@ -42,7 +42,7 @@ frappe.ui.TagEditor = Class.extend({
 							user_tags.push(tag)
 							me.user_tags = user_tags.join(",");
 							me.on_change && me.on_change(me.user_tags);
-							frappe.tags.utils.set_tags();
+							frappe.tags.utils.fetch_tags();
 						}
 					});
 				}
@@ -57,7 +57,7 @@ frappe.ui.TagEditor = Class.extend({
 							user_tags.splice(user_tags.indexOf(tag), 1);
 							me.user_tags = user_tags.join(",");
 							me.on_change && me.on_change(me.user_tags);
-							frappe.tags.utils.set_tags();
+							frappe.tags.utils.fetch_tags();
 						}
 					});
 				}
diff --git a/frappe/public/js/frappe/ui/toolbar/tag_utils.js b/frappe/public/js/frappe/ui/toolbar/tag_utils.js
index aab94775d6..9ba0b4d59e 100644
--- a/frappe/public/js/frappe/ui/toolbar/tag_utils.js
+++ b/frappe/public/js/frappe/ui/toolbar/tag_utils.js
@@ -29,7 +29,7 @@ frappe.tags.utils = {
 		return out;
 	},
 
-	set_tags() {
+	fetch_tags() {
 		frappe.call({
 			method: "frappe.desk.doctype.tag.tag.get_tags_list_for_awesomebar",
 			callback: function(r) {