--- a/exportData.csv.php
+++ b/exportData.csv.php
@@ -1,13 +1,16 @@
 <?php
 
 include_once("./lib/common.inc.php");
-
+setlocale(LC_CTYPE, 'C');
 // source: http://stackoverflow.com/questions/81934/easy-way-to-export-a-sql-table-without-access-to-the-server-or-phpmyadmin#81951
 $result = mysql_query('
-SELECT CNID,contractnotice.agencyName,agency.abn as agencyABN,publishDate,contractStart,contractEnd,value,description,procurementMethod,category,categoryUNSPSC
+SELECT CNID,contractnotice.agencyName,agency.abn as agencyABN,DATE(publishDate),contractStart,contractEnd,value,description,procurementMethod,category,categoryUNSPSC
 ,supplierABN,supplierName,supplierCity,supplierPostcode,supplierCountry,contactPostcode,
-IF(supplierABN != "",supplierABN,supplierName) as supplierID,
-concat("https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN",CNID) as sourceURL FROM `contractnotice` join agency on contractnotice.agencyName=agency.agencyName where childCN = 0');
+(
+ case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID
+ 
+concat("https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN",CNID) as sourceURL 
+FROM `contractnotice` join agency on contractnotice.agencyName=agency.agencyName where childCN = 0');
 if (!$result) die('Couldn\'t fetch records');
 $num_fields = mysql_num_fields($result);
 $headers = array();
@@ -22,6 +25,10 @@
     header('Expires: 0');
     fputcsv($fp, $headers);
     while ($row = mysql_fetch_assoc($result)) {
+	foreach ($row as &$colvalue) {
+			$colvalue =  preg_replace( '/[^[:print:]]/', '',
+			 utf8_encode($colvalue));
+		}
         fputcsv($fp, array_values($row));
     }
     die;