diff --git a/lib/classes/record/exportElement.class.php b/lib/classes/record/exportElement.class.php
index 593b25bdbd..c13a03d4d3 100644
--- a/lib/classes/record/exportElement.class.php
+++ b/lib/classes/record/exportElement.class.php
@@ -58,6 +58,12 @@ class record_exportElement extends record_adapter
     public function __construct($sbas_id, $record_id, $directory = '', $remain_hd = false)
     {
         $this->directory = $directory;
+
+        if ($this->directory) {
+            $unicode = new \unicode();
+            $this->directory = $unicode->remove_nonazAZ09($this->directory) . '/';
+        }
+
         $this->remain_hd = $remain_hd;
         $this->size = array();
         parent::__construct($sbas_id, $record_id);
diff --git a/lib/classes/set/export.class.php b/lib/classes/set/export.class.php
index 558555073c..8869ef62c0 100644
--- a/lib/classes/set/export.class.php
+++ b/lib/classes/set/export.class.php
@@ -82,7 +82,7 @@ class set_export extends set_abstract
                     new record_exportElement(
                         $basket_element->getRecord()->get_sbas_id(),
                         $record_id,
-                        $Basket->getName() . '/',
+                        $Basket->getName(),
                         $remain_hd[$base_id]
                 );
 
@@ -120,7 +120,7 @@ class set_export extends set_abstract
                             new record_exportElement(
                                 $child_basrec->get_sbas_id(),
                                 $record_id,
-                                $record->get_title(null, null, true) . '_' . $n . '/',
+                                $record->get_title(null, null, true) . '_' . $n,
                                 $remain_hd[$base_id]
                         );
 
diff --git a/www/include/download.php b/www/include/download.php
index fa7e7a4a5a..f04de023f8 100644
--- a/www/include/download.php
+++ b/www/include/download.php
@@ -47,7 +47,7 @@ if ($parm["ssttid"] != "") {
     /* @var $repository \Repositories\BasketRepository */
 
     $basket = $repository->findUserBasket($Request->get('ssttid'), $Core->getAuthenticatedUser(), false);
-    $exportname = str_replace(' ', '_', $basket->getName()) . "_" . date("Y-n-d");
+    $exportname = str_replace(array(' ', '\\', '/'), '_', $basket->getName()) . "_" . date("Y-n-d");
 }
 
 $list['export_name'] = $exportname . '.zip';