diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm b/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
index 3bdb51e0b..833378b26 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
@@ -47,11 +47,12 @@ use ZoneMinder::Database qw(:all);
use POSIX;
-use vars qw/ $table $primary_key %fields $debug/;
-$debug = 0;
+use vars qw/ $serial $primark_key $table $primary_key %fields $debug/;
+$serial = $primary_key = 'Id';
+$debug = 1;
$table = 'Storage';
$primary_key = 'Id';
-%fields = map { $_ => $_ } qw( Id Name Path DoDelete ServerId Type Url DiskSpace Scheme );
+%fields = map { $_ => $_ } qw( Id Name Path DoDelete ServerId Type Url DiskSpace Scheme Enabled);
sub Path {
if ( @_ > 1 ) {
diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index 3d1dbb26c..8b243924d 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -1034,7 +1034,7 @@ class Filter extends ZM_Object {
}
$html .= ''. $term['op'].''.PHP_EOL;
#$html .= ''.htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']).''.PHP_EOL;
- $html .= ''.htmlSelect("filter[Query][terms][$i][val]", $monitors, $term['val']).''.PHP_EOL;
+ $html .= ''.htmlSelect("filter[Query][terms][$i][val]", $monitors, split(',',$term['val'])).''.PHP_EOL;
} else if ( $term['attr'] == 'MonitorName' ) {
$monitor_names = ['' => translate('All')];
foreach (Monitor::find() as $m) {
diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index 4d03b3562..6a1785d1a 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -112,7 +112,7 @@ if ((!$replayMode) or !$replayModes[$replayMode]) {
$replayMode = 'none';
}
-$video_tag = ($Event->DefaultVideo() and ($codec == 'MP4' or $codec == 'auto'));
+$video_tag = ((false !== strpos($Event->DefaultVideo(), 'h264')) and ($codec == 'MP4' or $codec == 'auto'));
// videojs zoomrotate only when direct recording
$Zoom = 1;
@@ -145,8 +145,8 @@ $filterQuery = $filter->querystring();
$connkey = generateConnKey();
xhtmlHeaders(__FILE__, translate('Event').' '.$Event->Id());
+getBodyTopHTML();
?>
-