resolved merge conflicts

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__ = '8.7.10'
+__version__ = '8.7.11'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/public/js/frappe/list/list_view.js

@@ -127,6 +127,7 @@ frappe.views.ListView = frappe.ui.BaseList.extend({
 			return;
 		}
 
+		this.is_list_view = true;
 		this.page_name = 'List/' + this.doctype;
 		this.dirty = true;
 		this.tags_shown = false;

frappe/public/js/frappe/ui/base_list.js

@@ -185,9 +185,10 @@ frappe.ui.BaseList = Class.extend({
 		}
 
 		if (this.meta) {
-			var filter_count = 1;
-			$(`<span class="octicon octicon-search text-muted small"></span>`)
-				.appendTo(this.page.page_form);
+			if(this.is_list_view) {
+				$(`<span class="octicon octicon-search text-muted small"></span>`)
+					.prependTo(this.page.page_form);
+			}
 			this.page.add_field({
 				fieldtype: 'Data',
 				label: 'ID',

frappe/public/js/frappe/views/reports/query_report.js

@@ -365,6 +365,16 @@ frappe.views.QueryReport = Class.extend({
 		}
 	},
 	refresh: function() {
+		// throttle
+		// stop refresh from being called multiple times (from triggers ?)
+		if (!this.request_refresh) {
+			this.request_refresh = setTimeout(() => {
+				this._refresh();
+				this.request_refresh = null;
+			}, 300);
+		}
+	},
+	_refresh: function() {
 		// Run
 		var me = this;