diff --git a/frappe/public/js/frappe/list/doclistview.js b/frappe/public/js/frappe/list/doclistview.js
index d766f8d3f8..eda739be49 100644
--- a/frappe/public/js/frappe/list/doclistview.js
+++ b/frappe/public/js/frappe/list/doclistview.js
@@ -468,7 +468,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
 		      args.filters.push(f);
 		});
 
-		args.order_by = this.sort_selector.sort_by + ' ' + this.sort_selector.sort_order;
+		args.order_by = '`tab' + this.doctype + '`.`' + this.sort_selector.sort_by + '` ' + this.sort_selector.sort_order;
 
 		return args;
 	},
diff --git a/frappe/public/js/frappe/ui/sort_selector.html b/frappe/public/js/frappe/ui/sort_selector.html
index 1bf6ff4b50..6312b711a7 100644
--- a/frappe/public/js/frappe/ui/sort_selector.html
+++ b/frappe/public/js/frappe/ui/sort_selector.html
@@ -8,7 +8,7 @@
 	  	data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
 	    <span class="dropdown-text">{{ __(sort_by_label) }}</span>
 	  </a>
-	  <ul class="dropdown-menu">
+	  <ul class="dropdown-menu" style="max-height: 300px; overflow-y: scroll;">
 		{% for value in options %}
 	    <li><a class="option" data-value="{{ value.fieldname }}">
 			{{ __(value.label) }}</a></li>
diff --git a/frappe/www/print.py b/frappe/www/print.py
index fa4e337c6b..15dd10ba92 100644
--- a/frappe/www/print.py
+++ b/frappe/www/print.py
@@ -9,7 +9,7 @@ from frappe import _
 from frappe.modules import get_doc_path
 from jinja2 import TemplateNotFound
 from frappe.utils import cint, strip_html
-from frappe.utils.pdf import get_pdf
+from markdown2 import markdown
 
 no_cache = 1
 no_sitemap = 1
@@ -108,7 +108,7 @@ def get_html(doc, name=None, print_format=None, meta=None,
 			doc.format_data_map = format_data_map
 
 			template = "standard"
-			
+
 		elif print_format.standard=="Yes" or print_format.custom_format:
 			template = jenv.from_string(get_print_format(doc.doctype,
 				print_format))
@@ -125,6 +125,9 @@ def get_html(doc, name=None, print_format=None, meta=None,
 		template = jenv.get_template(standard_format)
 
 	letter_head = frappe._dict(get_letter_head(doc, no_letterhead) or {})
+
+	convert_markdown(doc, meta)
+
 	args = {
 		"doc": doc,
 		"meta": frappe.get_meta(doc.doctype),
@@ -143,6 +146,14 @@ def get_html(doc, name=None, print_format=None, meta=None,
 
 	return html
 
+def convert_markdown(doc, meta):
+	'''Convert text field values to markdown if necessary'''
+	for field in meta.fields:
+		if field.fieldtype=='Text Editor':
+			value = doc.get(field.fieldname)
+			if value and '<!-- markdown -->' in value:
+				doc.set(field.fieldname, markdown(value))
+
 @frappe.whitelist()
 def get_html_and_style(doc, name=None, print_format=None, meta=None,
 	no_letterhead=None, trigger_print=False):