diff --git a/misc/bkp/einsatz_0815_export_Test Export Rückmeldung Robert.csv b/misc/bkp/einsatz_0815_export_Test Export Rückmeldung Robert.csv
index dbc29ad..012a058 100644
--- a/misc/bkp/einsatz_0815_export_Test Export Rückmeldung Robert.csv	
+++ b/misc/bkp/einsatz_0815_export_Test Export Rückmeldung Robert.csv	
@@ -1,2 +1,2 @@
-"einsatznummer","id","waip_uuid","rmld_uuid","alias","einsatzkraft","maschinist","fuehrungskraft","agt","set_time","arrival_time","wache_id","wache_nr","wache_name"
-"0815",12,"52b01a1e-6fcc-4153-bf05-80743b7a0166","d819c5ae-9228-447f-8e2f-2d839b062fab",,1,0,0,0,"Wed Jun 17 2020 22:19:33 GMT+0200 (Mitteleuropäische Sommerzeit)","Wed Jun 17 2020 22:29:33 GMT+0200 (Mitteleuropäische Sommerzeit)",3,520201,"CB FW Cottbus 2"
\ No newline at end of file
+"einsatznummer","id","waip_uuid","rmld_uuid","einsatzkraft","maschinist","fuehrungskraft","agt","datetime(wr.set_time)","datetime(wr.arrival_time)","wache_id","wache_nr","wache_name"
+"0815",13,"4d3e0fc6-f186-46b6-a943-3f6e0092ce65","d0acb1e7-ce59-4e1c-8403-d877262d3492",0,1,0,1,,,2,520101,"CB FW Cottbus 1"
\ No newline at end of file
diff --git a/misc/bkp/einsatz_081e_export_Test_Export_Rückmeldung_Robert.csv b/misc/bkp/einsatz_081e_export_Test_Export_Rückmeldung_Robert.csv
new file mode 100644
index 0000000..1ac0251
--- /dev/null
+++ b/misc/bkp/einsatz_081e_export_Test_Export_Rückmeldung_Robert.csv
@@ -0,0 +1,3 @@
+"einsatznummer","id","waip_uuid","rmld_uuid","einsatzkraft","maschinist","fuehrungskraft","agt","set_time","arrival_time","wache_id","wache_nr","wache_name"
+"081e",14,"66bec76f-e74e-4103-ae13-c089d00bfd48","b3ba6da2-6b64-4b57-ba6d-d664d253aad4",0,1,0,0,,,2,520101,"CB FW Cottbus 1"
+"081e",15,"66bec76f-e74e-4103-ae13-c089d00bfd48","5df24db4-0412-49fb-84b8-38e17b51c18c",0,0,1,1,,,2,520101,"CB FW Cottbus 1"
\ No newline at end of file
diff --git a/server/sql_qry.js b/server/sql_qry.js
index c607fa3..e2d310e 100755
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -800,8 +800,8 @@ module.exports = function (db, app_cfg) {
 
   function db_rmld_get_for_export(waip_uuid, callback) {
     // alle Rueckmeldungen fuer einen Einsatz ermitteln
-    db.all(`SELECT we.einsatznummer, wr.id, wr.waip_uuid, wr.rmld_uuid, 
-      wr.einsatzkraft, wr.maschinist, wr.fuehrungskraft, wr.agt, wr.set_time, wr.arrival_time, wr.wache_id, wr.wache_nr, wr.wache_name
+    db.all(`SELECT we.einsatznummer, wr.id, wr.waip_uuid, wr.rmld_uuid, wr.einsatzkraft, wr.maschinist, wr.fuehrungskraft, wr.agt, 
+      strftime('%s',wr.set_time) set_time, strftime('%s', wr.arrival_time) arrival_time, wr.wache_id, wr.wache_nr, wr.wache_name
       FROM waip_response wr, waip_einsaetze we WHERE wr. waip_uuid like ? AND we.uuid like ?`, [waip_uuid, waip_uuid], function (err, rows) {
       if (err == null && rows) {
         callback && callback(rows);
diff --git a/server/waip.js b/server/waip.js
index fa08619..2f535fa 100755
--- a/server/waip.js
+++ b/server/waip.js
@@ -309,14 +309,15 @@ module.exports = function (io, sql, fs, brk, async, app_cfg) {
             data.forEach(function (row) {
               // fuer jede Wache (row.room) die verbundenen Sockets(Clients) ermitteln und Standby senden
               var room_sockets = io.nsps['/waip'].adapter.rooms[row.room];
-              console.log('room_sockets');
+   
 
               if (typeof room_sockets !== 'undefined') {
+                // FIXME gelöschter einsatz wird noch als Wachalarm angezeigt
+                console.log('room_sockets');
                 console.log(room_sockets.sockets);
                 Object.keys(room_sockets.sockets).forEach(function (socket_id) {
                   // Standby senden    
-                  var socket = io.of('/waip').connected[socket_id];
-                  // FIXME gelöschter einsatz wird noch als Wachalarm angezeigt
+                  var socket = io.of('/waip').connected[socket_id];                  
                   sql.db_client_check_waip_id(socket.id, waip.id, function (same_id) {
                     if (same_id) {
                       socket.emit('io.standby', null);
@@ -360,7 +361,9 @@ module.exports = function (io, sql, fs, brk, async, app_cfg) {
               try {
                 var csv = parse(part_rmld, opts);
                 // CSV Dateiname und Pfad festlegen
-                var csv_filename = 'einsatz_' + part_rmld[0].einsatznummer + '_export_' + export_data.export_name.replace(/[/\\?%*:|"<>]/g, '') + '.csv';
+                var csv_filename = export_data.export_name.replace(/[|&;$%@"<>()+,]/g, '');
+                csv_filename = csv_filename.replace(/ /g,"_");
+                csv_filename = 'einsatz_' + part_rmld[0].einsatznummer + '_export_' + csv_filename + '.csv';
                 csv_path = process.cwd() + app_cfg.rmld.backup_path;
                 //+ csv_filename;
                 console.log(csv_filename);
@@ -398,10 +401,10 @@ module.exports = function (io, sql, fs, brk, async, app_cfg) {
                       }
                     });
                     var mail_message = {
-                      from: 'Wachalarm-IP-Web - ' + app_cfg.public.company + ' <' + app_cfg.rmld.mail_from +'>',
+                      from: 'Wachalarm-IP-Web' + app_cfg.public.company + ' <' + app_cfg.rmld.mail_from +'>',
                       to: export_data.export_recipient,
                       subject: 'Automatischer Export Wachalarm-IP-Web - ' + export_data.export_name + ' - Einsatz ' + part_rmld[0].einsatznummer,
-                      html: 'Hallo,<br><br> anbei der automatische Export aller Einsatz-R&uuml;ckmeldungen f&uuml;r den Einsatz ' + part_rmld[0].einsatznummer + '<br><br>Mit freundlichen Gr&uuml;&szlig;en<br><br>' + app_cfg.global.company,
+                      html: 'Hallo,<br><br> anbei der automatische Export aller Einsatz-R&uuml;ckmeldungen f&uuml;r den Einsatz ' + part_rmld[0].einsatznummer + '<br><br>Mit freundlichen Gr&uuml;&szlig;en<br><br>' + app_cfg.public.company,
                       attachments: [{
                         filename: csv_filename,
                         content: csv