diff --git a/lib/classes/set/export.class.php b/lib/classes/set/export.class.php
index 67e97e2802..b64142b179 100644
--- a/lib/classes/set/export.class.php
+++ b/lib/classes/set/export.class.php
@@ -93,7 +93,7 @@ class set_export extends set_abstract
         {
           $record = new record_adapter($basrec[0], $basrec[1]);
         }
-        catch(Exception_Record_AdapterNotFound $e)
+        catch (Exception_Record_AdapterNotFound $e)
         {
           continue;
         }
@@ -407,7 +407,7 @@ class set_export extends set_abstract
    * @param boolean $rename_title
    * @return Array
    */
-  public function prepare_export(Array $subdefs, $rename_title=false)
+  public function prepare_export(Array $subdefs, $rename_title = false)
   {
     if (!is_array($subdefs))
     {
@@ -430,6 +430,7 @@ class set_export extends set_abstract
 
     foreach ($this->elements as $download_element)
     {
+      echo "eleme";
       $id = count($files);
 
       $files[$id] = array(
@@ -477,7 +478,7 @@ class set_export extends set_abstract
       $sd = $download_element->get_subdefs();
 
       foreach ($download_element->get_downloadable() as $name => $properties)
-      {
+      {        
         if ($properties === false || !in_array($name, $subdefs))
         {
           continue;
@@ -486,10 +487,6 @@ class set_export extends set_abstract
         {
           continue;
         }
-        if (!isset($sd[$name]))
-        {
-          continue;
-        }
 
         set_time_limit(100);
         $subdef_export = $subdef_alive = false;
@@ -685,7 +682,9 @@ class set_export extends set_abstract
         system_file::mkdir($caption_dir);
 
         $desc = self::get_caption(
-                        $download_element->get_base_id(), $download_element->get_record_id(), $session->get_ses_id()
+                        $download_element->get_base_id()
+                        , $download_element->get_record_id()
+                        , $session->get_ses_id()
         );
 
         $file = $files[$id]["export_name"]
@@ -713,7 +712,11 @@ class set_export extends set_abstract
 
 
         $desc = self::get_caption(
-                        $download_element->get_base_id(), $download_element->get_record_id(), $session->get_ses_id(), true, 'yaml'
+                        $download_element->get_base_id()
+                        , $download_element->get_record_id()
+                        , $session->get_ses_id()
+                        , true
+                        , 'yaml'
         );
 
         $file = $files[$id]["export_name"]
@@ -732,6 +735,7 @@ class set_export extends set_abstract
         }
       }
     }
+
     $this->list = array(
         'files' => $files,
         'names' => $file_names,
@@ -739,6 +743,7 @@ class set_export extends set_abstract
         'count' => $n_files
     );
 
+
     return $this->list;
   }
 
@@ -758,7 +763,6 @@ class set_export extends set_abstract
       return false;
     }
     if (isset($list['complete']) && $list['complete'] === true)
-
       return;
 
 
@@ -835,7 +839,7 @@ class set_export extends set_abstract
    * @param boolean $check_rights
    * @return string
    */
-  public static function get_caption($bas, $rec, $check_rights=true, $format = 'xml')
+  public static function get_caption($bas, $rec, $check_rights = true, $format = 'xml')
   {
     $dom = new DOMDocument();
     $dom->formatOutput = true;
@@ -950,7 +954,7 @@ class set_export extends set_abstract
    * @return Void
    */
   public static function stream_file(
-  $file, $exportname, $mime, $disposition='attachment')
+  $file, $exportname, $mime, $disposition = 'attachment')
   {
     require_once dirname(__FILE__) . "/../../../lib/vendor/Silex/autoload.php";
     $registry = registry::get_instance();
@@ -999,11 +1003,11 @@ class set_export extends set_abstract
          * @todo : merge this shitty fix with Response object.
          * 
          */
-        if(!headers_sent())
+        if (!headers_sent())
         {
           header("Pragma: public");
         }
-        
+
         $response->headers->set('Content-Type', $mime);
         $response->headers->set('Content-Name', $exportname);
         $response->headers->set('Content-Disposition', $disposition . "; filename=" . $exportname . ";");
@@ -1024,7 +1028,7 @@ class set_export extends set_abstract
    * @param String $disposition
    * @return Void
    */
-  public static function stream_data($data, $exportname, $mime, $disposition='attachment')
+  public static function stream_data($data, $exportname, $mime, $disposition = 'attachment')
   {
 
     header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
@@ -1059,7 +1063,7 @@ class set_export extends set_abstract
     $user = false;
     if ($anonymous)
     {
-
+      
     }
     else
     {