diff --git a/module/file/view/export2csv.html.php b/module/file/view/export2csv.html.php
index 013b3c0972..03b3d5cd74 100644
--- a/module/file/view/export2csv.html.php
+++ b/module/file/view/export2csv.html.php
@@ -14,5 +14,11 @@
 echo '"'. implode('","', $fields) . '"' . "\n";
 foreach($rows as $row)
 {
-    echo '"'. implode('","', (array)$row) . '"' . "\n";
+    echo '"';
+    foreach($fields as $fieldName => $fieldLabel)
+    {
+        isset($row->$fieldName) ? print($row->$fieldName) : print('');
+        echo '","';
+    }
+    echo '"' . "\n";
 }
diff --git a/module/file/view/export2html.html.php b/module/file/view/export2html.html.php
index 92a68a1811..ab20de8009 100644
--- a/module/file/view/export2html.html.php
+++ b/module/file/view/export2html.html.php
@@ -30,10 +30,11 @@ table, th, td{font-size:12px; border:1px solid gray; border-collapse:collapse;}
 <?php
 foreach($rows as $row)
 {
-    echo "<tr>\n";
-    foreach($row as $fieldName => $fieldValue)
+    echo "<tr valign='top'>\n";
+    foreach($fields as $fieldName => $fieldLabel)
     {
-        echo "<td>$fieldValue</td>\n";
+        $fieldValue = isset($row->$fieldName) ? $row->$fieldName : '';
+        echo "<td><nobr>$fieldValue</nobr></td>\n";
     }
     echo "</tr>\n";
 }
diff --git a/module/file/view/export2xml.html.php b/module/file/view/export2xml.html.php
index ade8ee492a..990cb7e191 100644
--- a/module/file/view/export2xml.html.php
+++ b/module/file/view/export2xml.html.php
@@ -24,9 +24,9 @@ foreach($fields as $fieldName => $fieldLabel)
 foreach($rows as $row)
 {
     echo "  <row>\n";
-    foreach($row as $fieldName => $fieldValue)
+    foreach($fields as $fieldName => $fieldLabel)
     {
-        $fieldValue = htmlspecialchars($fieldValue);
+        $fieldValue = isset($row->$fieldName) ? htmlspecialchars($row->$fieldName) : '';
         echo "    <$fieldName>$fieldValue</$fieldName>\n";
     }
     echo "  </row>\n";