diff --git a/lib/classes/record/exportElement.php b/lib/classes/record/exportElement.php
index 737ad5a1ad..ddae4ca66d 100644
--- a/lib/classes/record/exportElement.php
+++ b/lib/classes/record/exportElement.php
@@ -68,8 +68,6 @@ class record_exportElement extends record_adapter
         parent::__construct($app, $sbas_id, $record_id);
 
         $this->get_actions($remain_hd);
-
-        return $this;
     }
 
     /**
@@ -270,8 +268,7 @@ class record_exportElement extends record_adapter
     }
 
     /**
-     *
-     * @return Array
+     * @return array
      */
     public function get_orderable()
     {
@@ -279,8 +276,7 @@ class record_exportElement extends record_adapter
     }
 
     /**
-     *
-     * @return Array
+     * @return array
      */
     public function get_downloadable()
     {
diff --git a/lib/classes/set/export.php b/lib/classes/set/export.php
index 230a0a10a7..739c5ab5b7 100644
--- a/lib/classes/set/export.php
+++ b/lib/classes/set/export.php
@@ -99,19 +99,20 @@ class set_export extends set_abstract
         } else {
             $this->exportName = "Export_" . date("Y-n-d") . '_' . mt_rand(100, 999);
 
-            $tmp_lst = explode(';', $lst);
             $n = 1;
-            foreach ($tmp_lst as $basrec) {
-                $basrec = explode('_', $basrec);
-                if (count($basrec) != 2)
-                    continue;
 
+            $records = new \Alchemy\Phrasea\Record\RecordReferenceCollection();
+
+            foreach (explode(';', $lst) as $basrec) {
                 try {
-                    $record = new record_adapter($this->app, $basrec[0], $basrec[1]);
-                } catch (\Exception_Record_AdapterNotFound $e) {
+                    $records[] = \Alchemy\Phrasea\Record\RecordReference::createFromRecordReference($basrec);
+                } catch (Exception $exception) {
+                    // Ignore invalid record references
                     continue;
                 }
+            }
 
+            foreach ($records->toRecords($app->getApplicationBox()) as $record) {
                 if ($record->isStory()) {
                     foreach ($record->getChildren() as $child_basrec) {
                         $base_id = $child_basrec->getBaseId();