diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py
index c5505b1b13..a5dfeafb6c 100644
--- a/frappe/core/doctype/report/report.py
+++ b/frappe/core/doctype/report/report.py
@@ -57,7 +57,14 @@ class Report(Document):
 		if self.report_type in ('Query Report', 'Script Report'):
 			# query and script reports
 			data = frappe.desk.query_report.run(self.name, filters=filters, user=user)
-			out.append([d.split(':')[0] for d in data.get('columns')])
+			columns_list = []
+			for d in data.get('columns'):
+				if isinstance(d, dict):
+					columns_list.append(d.get('label'))
+				else:
+					columns_list.append(d.split(':')[0])
+
+			out.append(columns_list)
 			out += data.get('result')
 		else:
 			# standard report
diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.js b/frappe/email/doctype/auto_email_report/auto_email_report.js
index f01fec1c76..456ddff18f 100644
--- a/frappe/email/doctype/auto_email_report/auto_email_report.js
+++ b/frappe/email/doctype/auto_email_report/auto_email_report.js
@@ -60,9 +60,19 @@ frappe.ui.form.on('Auto Email Report', {
 				<tr><th style="width: 50%">'+__('Filter')+'</th><th>'+__('Value')+'</th></tr>\
 				</thead><tbody></tbody></table>').appendTo(wrapper);
 				$('<p class="text-muted small">' + __("Click table to edit") + '</p>').appendTo(wrapper);
+
 			var filters = JSON.parse(frm.doc.filters || '{}');
 			var report_filters = frappe.query_reports[frm.doc.report].filters;
 
+			report_filters_list = []
+			$.each(report_filters, function(key, val){
+				// Remove break fieldtype from the filters
+				if(val.fieldtype != 'Break') {
+					report_filters_list.push(val)
+				}
+			})
+			report_filters = report_filters_list;
+
 			report_filters.forEach(function(f) {
 				$('<tr><td>' + f.label + '</td><td>'+ frappe.format(filters[f.fieldname], f) +'</td></tr>')
 					.appendTo(table.find('tbody'));