diff --git a/admin/code/ModelAdmin.php b/admin/code/ModelAdmin.php
index 037e9d6af..2a807059c 100644
--- a/admin/code/ModelAdmin.php
+++ b/admin/code/ModelAdmin.php
@@ -215,6 +215,13 @@ abstract class ModelAdmin extends LeftAndMain {
 			$params = ArrayLib::array_map_recursive('trim', $params);
 		}
 
+		// Parse all DateFields to handle user input non ISO 8601 dates
+		foreach($context->getFields() as $field) {
+			if($field instanceof DatetimeField) {
+				$params[$field->getName()] = date('Y-m-d', strtotime($params[$field->getName()]));
+			}
+		}
+
 		$list = $context->getResults($params);
 
 		$this->extend('updateList', $list);
diff --git a/control/HTTPRequest.php b/control/HTTPRequest.php
index 3de2a3668..81b4ab9f2 100644
--- a/control/HTTPRequest.php
+++ b/control/HTTPRequest.php
@@ -397,7 +397,7 @@ class SS_HTTPRequest implements ArrayAccess {
 		$response = new SS_HTTPResponse($fileData);
 		$response->addHeader("Content-Type", "$mimeType; name=\"" . addslashes($fileName) . "\"");
 		// Note a IE-only fix that inspects this header in HTTP::add_cache_headers().
-		$response->addHeader("Content-Disposition", "attachment; filename=" . addslashes($fileName));
+		$response->addHeader("Content-Disposition", "attachment; filename=\"" . addslashes($fileName) . "\"");
 		$response->addHeader("Content-Length", strlen($fileData));
 
 		return $response;