diff --git a/_attachments/pages/index.html b/_attachments/pages/index.html
index 49e7e5fb..f4651fa3 100644
--- a/_attachments/pages/index.html
+++ b/_attachments/pages/index.html
@@ -11,8 +11,7 @@
   <script type="text/javascript">
     $(function() {
       
-      var name,
-          baseURL = "_rewrite/",
+      var baseURL = "_rewrite/",
           vhost = false;
       
       if (document.location.pathname.indexOf("_design") == -1) {
@@ -32,6 +31,7 @@
       }
       
       function gotDb(dbInfo) {
+                
         render('db', 'stats', dbInfo);
         
         var data = {
diff --git a/lists/csv.js b/lists/csv.js
index 18baae96..d2b46f14 100644
--- a/lists/csv.js
+++ b/lists/csv.js
@@ -18,7 +18,9 @@ function(head, req) {
       for (var header in headers) {
         if (row.value[headers[header]]) {
           if (startedOutput) send(",");
-          send("\"" + row.value[headers[header]] + "\"");
+          var value = row.value[headers[header]];
+          if (typeof(value) == "object") value = JSON.stringify(value).replace(/"/g, '\\"');
+          send("\"" + value + "\"");
         } else {
           if (startedOutput) send(",");
         } 
diff --git a/rewrites.json b/rewrites.json
index b3d38cfa..71db07a3 100644
--- a/rewrites.json
+++ b/rewrites.json
@@ -21,7 +21,7 @@
 	},
 	{
 		"to": "_list/csv/all", 
-		"from": "*.csv"
+		"from": "csv"
 	},
 	{
 		"to": "_list/urlencode/headers",