diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 9f2c0419a6..9d609e1ef7 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -243,7 +243,7 @@ def validate_fields(meta):
 				if fold_exists:
 					frappe.throw(_("There can be only one Fold in a form"))
 				fold_exists = True
-				if i < len(fields)-1:
+				if i < len(fields)-2:
 					nxt = fields[i+1]
 					if nxt.fieldtype != "Section Break" \
 						or (nxt.fieldtype=="Section Break" and not nxt.label):
diff --git a/frappe/public/js/frappe/views/listview.js b/frappe/public/js/frappe/views/listview.js
index 7ad0387daa..e80ca5ab98 100644
--- a/frappe/public/js/frappe/views/listview.js
+++ b/frappe/public/js/frappe/views/listview.js
@@ -85,6 +85,9 @@ frappe.views.ListView = Class.extend({
 		// additional fields
 		if(this.settings.add_fields) {
 			$.each(this.settings.add_fields, function(i, d) {
+				if(d.indexOf("`tab")===-1) {
+					d = "`tab" + me.doctype + "`." + d;
+				}
 				if(me.fields.indexOf(d)==-1)
 					me.fields.push(d);
 			});
diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index 6885da1733..85ab80b214 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -24,6 +24,7 @@ def get_template(path):
 	return get_jenv().get_template(path)
 
 def render_template(template, context):
+	context.update(get_allowed_functions_for_jenv())
 	template = Template(template)
 	return template.render(**context)