diff --git a/frappe/model/mapper.py b/frappe/model/mapper.py
index ea51ec97ea..744e6cb6a9 100644
--- a/frappe/model/mapper.py
+++ b/frappe/model/mapper.py
@@ -77,8 +77,8 @@ def map_doc(source_doc, target_doc, table_map, source_parent=None):
 def map_fields(source_doc, target_doc, table_map, source_parent):
 	no_copy_fields = set([d.fieldname for d in source_doc.meta.get("fields") if (d.no_copy==1 or d.fieldtype=="Table")]
 		+ [d.fieldname for d in target_doc.meta.get("fields") if (d.no_copy==1 or d.fieldtype=="Table")]
-		+ default_fields
-		+ table_map.get("field_no_map", []))
+		+ list(default_fields)
+		+ list(table_map.get("field_no_map", [])))
 
 	for df in target_doc.meta.get("fields"):
 		if df.fieldname not in no_copy_fields:
diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index fb3174cfac..79c2accdec 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -1201,6 +1201,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 		this.switcher = $('<p class="text-right small">\
 			<a href="#" class="switcher"></a></p>')
 			.appendTo(this.input_area)
+			.find("a")
 			.click(function() {
 				me.switch();
 				return false;