diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index ac5df5383..2038c521b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -99,7 +99,7 @@ sub Execute {
   my $sql = $self->Sql();
 
   if ( $self->{HasDiskPercent} ) {
-    my $disk_percent = getDiskPercent( $$self{Storage} ? $$self{Storage}->Path() : () );
+    my $disk_percent = getDiskPercent();
     $sql =~ s/zmDiskPercent/$disk_percent/g;
   }
   if ( $self->{HasDiskBlocks} ) {
@@ -195,9 +195,6 @@ sub Sql {
                 # This gets used later, I forget for what
                 $$self{Server} = new ZoneMinder::Server( $temp_value );
               }
-            } elsif ( $term->{attr} eq 'StorageId' ) {
-              $value = "'$temp_value'";
-              $$self{Storage} = new ZoneMinder::Storage( $temp_value );
             } elsif ( $term->{attr} eq 'Name'
                 || $term->{attr} eq 'Cause'
                 || $term->{attr} eq 'Notes'
@@ -268,9 +265,9 @@ sub Sql {
     }
     # Don't do this, it prevents re-generation and concatenation.
     # If the file already exists, then the video won't be re-recreated
-    #if ( $self->{AutoVideo} ) {
-      #push @auto_terms, "E.Videoed = 0";
-    #}
+    if ( $self->{AutoVideo} ) {
+      push @auto_terms, "E.Videoed = 0";
+    }
     if ( $self->{AutoUpload} ) {
       push @auto_terms, "E.Uploaded = 0";
     }
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index cd0dd37fe..52c382601 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -27,57 +27,57 @@ if ( $running == null )
 
 $eventCounts = array(
     array(
-        "title" => translate('Events'),
-        "filter" => array(
-            "terms" => array(
+        'title' => translate('Events'),
+        'filter' => array(
+            'terms' => array(
             )
         ),
-        "total" => 0,
+        'total' => 0,
     ),
     array(
-        "title" => translate('Hour'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "DateTime", "op" => ">=", "val" => "-1 hour" ),
+        'title' => translate('Hour'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "DateTime", 'op' => ">=", 'val' => "-1 hour" ),
             )
         ),
-        "total" => 0,
+        'total' => 0,
     ),
     array(
-        "title" => translate('Day'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "DateTime", "op" => ">=", "val" => "-1 day" ),
+        'title' => translate('Day'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "DateTime", 'op' => ">=", 'val' => "-1 day" ),
             )
         ),
-        "total" => 0,
+        'total' => 0,
     ),
     array(
-        "title" => translate('Week'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "DateTime", "op" => ">=", "val" => "-7 day" ),
+        'title' => translate('Week'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "DateTime", 'op' => ">=", 'val' => "-7 day" ),
             )
         ),
-        "total" => 0,
+        'total' => 0,
     ),
     array(
-        "title" => translate('Month'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "DateTime", "op" => ">=", "val" => "-1 month" ),
+        'title' => translate('Month'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "DateTime", 'op' => ">=", 'val' => "-1 month" ),
             )
         ),
-        "total" => 0,
+        'total' => 0,
     ),
     array(
-        "title" => translate('Archived'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "1" ),
+        'title' => translate('Archived'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "Archived", 'op' => "=", 'val' => "1" ),
             )
         ),
-        "total" => 0,
+        'total' => 0,
     ),
 );
 
@@ -94,12 +94,12 @@ for( $i = 0; $i < count($displayMonitors); $i += 1 ) {
   $monitor['ZoneCount'] = dbFetchOne( 'select count(Id) as ZoneCount from Zones where MonitorId = ?', 'ZoneCount', array($monitor['Id']) );
   $counts = array();
   for ( $j = 0; $j < count($eventCounts); $j += 1 ) {
-    $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( "cnj" => "and", "attr" => "MonitorId", "op" => "=", "val" => $monitor['Id'] ) );
+    $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( 'cnj' => 'and', 'attr' => 'MonitorId', 'op' => '=', 'val' => $monitor['Id'] ) );
     parseFilter( $filter );
     $counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j";
     $monitor['eventCounts'][$j]['filter'] = $filter;
   }
-  $sql = "select ".join($counts,", ")." from Events as E where MonitorId = ?";
+  $sql = 'select '.join($counts,', ').' from Events as E where MonitorId = ?';
   $counts = dbFetchOne( $sql, NULL, array($monitor['Id']) );
   if ( $counts )
     $displayMonitors[$i] = $monitor = array_merge( $monitor, $counts );
@@ -162,12 +162,13 @@ xhtmlHeaders( __FILE__, translate('Console') );
               <input class="btn btn-primary" type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/>
               <input class="btn btn-danger" type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/>
             </td>
-<?php for ( $i = 0; $i < count($eventCounts); $i++ ) {
-    parseFilter( $eventCounts[$i]['filter'] );
+<?php
+      for ( $i = 0; $i < count($eventCounts); $i++ ) {
+        parseFilter( $eventCounts[$i]['filter'] );
 ?>
             <td class="colEvents"><?php echo makePopupLink( '?view='.$eventsView.'&amp;page=1'.$eventCounts[$i]['filter']['query'], $eventsWindow, $eventsView, $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td>
 <?php
-}
+      }
 ?>
             <td class="colZones"><?php echo $zoneCount ?></td>
 <?php if ( canEdit('Monitors') ) { ?>
@@ -183,25 +184,25 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
           <tr id="<?php echo 'monitor_id-'.$monitor['Id'] ?>" title="<?php echo $monitor['Id'] ?>">
 <?php
     if ( !$monitor['zmc'] ) {
-      $dclass = "errorText";
+      $dclass = 'errorText';
     } else {
     // https://github.com/ZoneMinder/ZoneMinder/issues/1082
       if ( !$monitor['zma'] && $monitor['Function']!='Monitor' )
-        $dclass = "warnText";
+        $dclass = 'warnText';
       else
-        $dclass = "infoText";
+        $dclass = 'infoText';
     }
     if ( $monitor['Function'] == 'None' )
-      $fclass = "errorText";
+      $fclass = 'errorText';
     //elseif ( $monitor['Function'] == 'Monitor' )
      //   $fclass = "warnText";
     else
-      $fclass = "infoText";
+      $fclass = 'infoText';
     if ( !$monitor['Enabled'] )
-      $fclass .= " disabledText";
+      $fclass .= ' disabledText';
     $scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
 ?>
-<?php if ( ZM_WEB_ID_ON_CONSOLE ) { ?>
+<?phpif ( ZM_WEB_ID_ON_CONSOLE ) { ?>
             <td class="colId"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Id'], $running && ($monitor['Function'] != 'None') && canView('Stream') ) ?></td>
 <?php } ?>
             <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView('Stream') ) ?></td>
@@ -209,13 +210,13 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
 <?php if ( count($servers) ) { ?>
             <td class="colServer"><?php $Server = new Server( $monitor['ServerId'] ); echo $Server->Name(); ?></td>
 <?php } ?>
-<?php if ( $monitor['Type'] == "Local" ) { ?>
+<?php if ( $monitor['Type'] == 'Local' ) { ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td>
-<?php } elseif ( $monitor['Type'] == "Remote" ) { ?>
+<?php } elseif ( $monitor['Type'] == 'Remote' ) { ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*@/', '', $monitor['Host'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
-<?php } elseif ( $monitor['Type'] == "File" ) { ?>
+<?php } elseif ( $monitor['Type'] == 'File' ) { ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
-<?php } elseif ( $monitor['Type'] == "Ffmpeg" || $monitor['Type'] == "Libvlc" ) {
+<?php } elseif ( $monitor['Type'] == 'Ffmpeg' || $monitor['Type'] == 'Libvlc' ) {
     $domain = parse_url( $monitor['Path'], PHP_URL_HOST );
     $shortpath = $domain ? $domain : preg_replace( '/^.*\//', '', $monitor['Path'] );
     if ( $shortpath == '' ) {
@@ -223,13 +224,13 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
     }
 ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$shortpath.'</span>', canEdit( 'Monitors' ) ) ?></td>
-<?php } elseif ( $monitor['Type'] == "cURL" ) { ?>
+<?php } elseif ( $monitor['Type'] == 'cURL' ) { ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
 <?php } else { ?>
             <td class="colSource">&nbsp;</td>
 <?php } ?>
 <?php if ( $show_storage_areas ) { ?>
-			<td class="colStorage"><?php $Storage = new Storage( $monitor['StorageId'] ); echo $Storage->Name(); ?></td>
+            <td class="colStorage"><?php $Storage = new Storage( $monitor['StorageId'] ); echo $Storage->Name(); ?></td>
 <?php } ?>
 <?php
     for ( $i = 0; $i < count($eventCounts); $i++ ) {