diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 5b478316d..5ff316078 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -691,6 +691,7 @@ sub substituteTags {
   $text =~ s/%EC%/$Event->{Cause}/g;
   $text =~ s/%ED%/$Event->{Notes}/g;
   $text =~ s/%ET%/$Event->{StartTime}/g;
+  $text =~ s/%EVF%/$$Event{DefaultVideo}/g; # Event video filename
   $text =~ s/%EL%/$Event->{Length}/g;
   $text =~ s/%EF%/$Event->{Frames}/g;
   $text =~ s/%EFA%/$Event->{AlarmFrames}/g;
@@ -1017,8 +1018,7 @@ sub executeCommand {
 
   my $event_path = $Event->Path();
 
-  my $command = $filter->{AutoExecuteCmd};
-  $command .= " $event_path";
+  my $command = $filter->{AutoExecuteCmd}.' '.$event_path;
   $command = substituteTags($command, $filter, $Event);
 
   Info("Executing '$command'");