diff --git a/frappe/patches/v11_0/fix_order_by_in_reports_json.py b/frappe/patches/v11_0/fix_order_by_in_reports_json.py
index 28558ef4fb..561efdcee3 100644
--- a/frappe/patches/v11_0/fix_order_by_in_reports_json.py
+++ b/frappe/patches/v11_0/fix_order_by_in_reports_json.py
@@ -7,6 +7,9 @@ def execute():
 
 	for d in reports_data:
 		doc = frappe.get_doc('Report', d.get('name'))
+
+		if not doc.get('json'): continue
+
 		json_data = json.loads(doc.get('json'))
 
 		parts = []
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 77e691191a..1668d4a25d 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -1055,8 +1055,9 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 							for (let cdt in values) {
 								fields = fields.concat(values[cdt].map(f => [f, cdt]));
 							}
-
-							this.fields = fields;
+							
+							// always keep name (ID) column
+							this.fields = [["name", this.doctype], ...fields];
 
 							this.fields.map(f => this.add_currency_column(f[0], f[1]));
 
diff --git a/frappe/public/less/chat.less b/frappe/public/less/chat.less
index 74fd78c01b..290e068d90 100644
--- a/frappe/public/less/chat.less
+++ b/frappe/public/less/chat.less
@@ -3,7 +3,7 @@
 // http://codeguide.co - @mdo (Author of Bootstrap)
 
 @import "flex.less";
-@import {reference} "common.less";
+@import (reference) "common.less";
 
 // Typography
 @font-weight-bold:								700;