diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php
index 5b0cffc52..9573d45ff 100644
--- a/web/skins/classic/includes/export_functions.php
+++ b/web/skins/classic/includes/export_functions.php
@@ -583,7 +583,7 @@ function eventlist_html($Event, $exportDetail, $exportFrames, $exportStructure)
 ';
 	} # end if has jpegs
 	if ($Event->DefaultVideo()) {
-    $html .= '<a href="'.$Event->Id().'/'.$Event->DefaultVideo() .'">';
+    $html .= '<a href="'.$Event->Id().($exportStructure == 'flat'?'_':'/').$Event->DefaultVideo() .'">';
     $html .= '<img width="'.ZM_WEB_LIST_THUMB_WIDTH.'" src="'. $Event->Id().($exportStructure=='flat'?'_':'/').'snapshot.jpg" alt="'.$Event->Id().'" loading="lazy" />';
     $html .= '</a><br/>'.PHP_EOL;
 	}
@@ -931,14 +931,21 @@ function exportEvents(
       ZM\Error("Can't mkdir $event_dir");
     }
     $event_exportFileList = exportFileList($event, $exportDetail, $exportFrames, $exportImages, $exportVideo, $exportMisc);
-    $exportFileList = array_merge($exportFileList, $event_exportFileList);
+    #$exportFileList = array_merge($exportFileList, $event_exportFileList);
     foreach ($event_exportFileList as $file) {
      #if ( preg_match('/\.html$/', $file) )
         #continue;
       if ($exportStructure == 'flat') {
-        $cmd = 'cp -as '.$event->Path().'/'.$file.' '.$export_dir.'/'.$event->Id().'_'.$file. ' 2>&1';
+        if (false !== strpos($file, $event->Id())) {
+          $cmd = 'cp -as '.$event->Path().'/'.$file.' '.$export_dir.'/'.$file. ' 2>&1';
+          $exportFileList[] = $file;
+        } else {
+          $cmd = 'cp -as '.$event->Path().'/'.$file.' '.$export_dir.'/'.$event->Id().'_'.$file. ' 2>&1';
+          $exportFileList[] = $event->Id().'_'.$file;
+        }
       } else {
         $cmd = 'cp -as '.$event->Path().'/'.$file.' '.$export_dir.'/'.$event->Id().'/'.$file. ' 2>&1';
+        $exportFileList[] = $event->Id().'/'.$file;
       }
       exec($cmd, $output, $return);
       ZM\Debug($cmd.' return code: '.$return.' output: '.print_r($output,true));
@@ -954,16 +961,18 @@ function exportEvents(
   }
   //if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') )
     //Error("Failed linking video.js");
+  //
+  if (!($exportDetail or $exportFrames or $exportImages or $exportVideo or $exportMisc)) {
+    $html_eventMaster_file = 'zmEventImagesMaster.html';
+    $html_eventMaster_path = $export_dir.'/'.$html_eventMaster_file;
 
-  $html_eventMaster_file = 'zmEventImagesMaster.html';
-  $html_eventMaster_path = $export_dir.'/'.$html_eventMaster_file;
-
-  if (($fp = fopen($html_eventMaster_path, 'w'))) {
-    fwrite($fp, exportEventImagesMaster($eids, $exportDetail, $exportFrames, $exportStructure));
-    fclose($fp);
-    $exportFileList[] = $html_eventMaster_file;
-  } else {
-    ZM\Error("Can't open event images export file '$html_eventMaster_path'");
+    if (($fp = fopen($html_eventMaster_path, 'w'))) {
+      fwrite($fp, exportEventImagesMaster($eids, $exportDetail, $exportFrames, $exportStructure));
+      fclose($fp);
+      $exportFileList[] = $html_eventMaster_file;
+    } else {
+      ZM\Error("Can't open event images export file '$html_eventMaster_path'");
+    }
   }
 
   $listFile = $export_dir.'/'.$export_listFile;