diff --git a/cgi-bin/webnotes/utils/jsdependency.py b/cgi-bin/webnotes/utils/jslib/jsdependency.py
similarity index 100%
rename from cgi-bin/webnotes/utils/jsdependency.py
rename to cgi-bin/webnotes/utils/jslib/jsdependency.py
diff --git a/cgi-bin/webnotes/utils/jsmin.py b/cgi-bin/webnotes/utils/jslib/jsmin.py
similarity index 100%
rename from cgi-bin/webnotes/utils/jsmin.py
rename to cgi-bin/webnotes/utils/jslib/jsmin.py
diff --git a/cgi-bin/webnotes/utils/jsnamespace.py b/cgi-bin/webnotes/utils/jslib/jsnamespace.py
similarity index 100%
rename from cgi-bin/webnotes/utils/jsnamespace.py
rename to cgi-bin/webnotes/utils/jslib/jsnamespace.py
diff --git a/cgi-bin/webnotes/utils/jstimestamp.py b/cgi-bin/webnotes/utils/jslib/jstimestamp.py
similarity index 100%
rename from cgi-bin/webnotes/utils/jstimestamp.py
rename to cgi-bin/webnotes/utils/jslib/jstimestamp.py
diff --git a/cgi-bin/webnotes/widgets/form.py b/cgi-bin/webnotes/widgets/form.py
index 7f5a325770..6eddede16f 100644
--- a/cgi-bin/webnotes/widgets/form.py
+++ b/cgi-bin/webnotes/widgets/form.py
@@ -214,19 +214,18 @@ def runserverobj():
 
 def make_csv_output(res, dt):
 	import webnotes
-	from webnotes.utils import getCSVelement
-
-	txt = []
-	if type(res)==list:
-		for r in res:
-			txt.append(','.join([getCSVelement(i) for i in r]))
-		
-		txt = '\n'.join(txt)
 	
-	else:
-		txt = 'Output was not in list format\n' + r
-					
-	webnotes.response['result'] = txt
+	from cStringIO import StringIO
+	import csv
+	
+	f = StringIO()
+	writer = csv.writer(f)
+	for r in res:
+		writer.writerow(r)
+	
+	f.seek(0)
+						
+	webnotes.response['result'] = f.read()
 	webnotes.response['type'] = 'csv'
 	webnotes.response['doctype'] = dt.replace(' ','')						
 
diff --git a/cgi-bin/webnotes/widgets/query_builder.py b/cgi-bin/webnotes/widgets/query_builder.py
index cf272434e3..72e320cd70 100644
--- a/cgi-bin/webnotes/widgets/query_builder.py
+++ b/cgi-bin/webnotes/widgets/query_builder.py
@@ -294,7 +294,7 @@ def runquery(q='', ret=0, from_export=0):
 # ====================================================================
 
 def runquery_csv():
-	from webnotes.utils import getCSVelement
+	global out
 
 	# run query
 	res = runquery(from_export = 1)
@@ -312,22 +312,19 @@ def runquery_csv():
 	
 	# Headings
 	heads = []
-	for h in out['colnames']:
-		heads.append(getCSVelement(h))
-	if form.has_key('colnames'):
-		for h in form.getvalue('colnames').split(','):
-			heads.append(getCSVelement(h))
-
-	# Output dataset
-	dset = [rep_name, '']
-	if heads:
-		dset.append(','.join(heads))
 	
-	# Data
-	for r in out['values']:
-		dset.append(','.join([getCSVelement(i) for i in r]))
-		
-	txt = '\n'.join(dset)
-	out['result'] = txt
+	rows = [[rep_name], out['colnames']] + out['values']
+	
+	from cStringIO import StringIO
+	import csv
+	
+	f = StringIO()
+	writer = csv.writer(f)
+	for r in rows:
+		writer.writerow(r)
+	
+	f.seek(0)
+	out['result'] = f.read()
 	out['type'] = 'csv'
 	out['doctype'] = rep_name
+