diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index b2d62d461..f9ac3b6d2 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -670,8 +670,25 @@ insert into Users VALUES (NULL,'admin',password('admin'),'',1,'View','Edit','Edi
 --
 -- Add a sample filter to purge the oldest 100 events when the disk is 95% full
 --
-insert into Filters values (NULL,'PurgeWhenFull','{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',0,0,0,0,0,0,'',1,0,1,0);
-insert into Filters values (NULL,'Update DiskSpace','{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}],"sort_field":"Id","sort_asc":"1","limit":"100"}',0,0,0,0,0,0,'',1,1,1,0);
+  `Id` int(10) unsigned NOT NULL auto_increment,
+  `Name` varchar(64) NOT NULL default '',
+  `Query` text NOT NULL,
+  `AutoArchive` tinyint(3) unsigned NOT NULL default '0',
+  `AutoVideo` tinyint(3) unsigned NOT NULL default '0',
+  `AutoUpload` tinyint(3) unsigned NOT NULL default '0',
+  `AutoEmail` tinyint(3) unsigned NOT NULL default '0',
+  `AutoMessage` tinyint(3) unsigned NOT NULL default '0',
+  `AutoExecute` tinyint(3) unsigned NOT NULL default '0',
+  `AutoExecuteCmd` tinytext,
+  `AutoDelete` tinyint(3) unsigned NOT NULL default '0',
+  `AutoMove` tinyint(3) unsigned NOT NULL default '0',
+  `AutoMoveTo`  smallint(5) unsigned NOT NULL default 0,
+  `UpdateDiskSpace` tinyint(3) unsigned NOT NULL default '0',
+  `Background` tinyint(1) unsigned NOT NULL default '0',
+  `Concurrent` tinyint(1) unsigned NOT NULL default '0',
+
+insert into Filters values (NULL,'PurgeWhenFull','{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',0/*AutoArchive*/,0/*AutoVideo*/,0/*AutoUpload*/,0/*AutoEmail*/,0/*AutoMessage*/,0/*AutoExecute*/,'',1/*AutoDelete*/,0/*AutoMove*/,0/*MoveTo*/,0/*UpdateDiskSpace*/,1/*Background*/,0/*Concurrent*/);
+insert into Filters values (NULL,'Update DiskSpace','{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}',0,0,0,0,0,0,'',0,0,0,1,1,0);
 
 --
 -- Add in some sample control protocol definitions
diff --git a/db/zm_update-1.31.18.sql b/db/zm_update-1.31.18.sql
index fd000bcfa..5ba3b6caa 100644
--- a/db/zm_update-1.31.18.sql
+++ b/db/zm_update-1.31.18.sql
@@ -13,10 +13,10 @@ EXECUTE stmt;
 
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM Filters WHERE Name = 'Update DiskSpace'
-      AND Query = '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}],"sort_field":"Id","sort_asc":"1","limit":"100"}'
+      AND Query = '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}'
     ) > 0,
     "SELECT 'Update Disk Space Filter already exists.'",
-    "INSERT INTO Filters (Name,Query,UpdateDiskSpace,Background) values ('Update DiskSpace','{\"terms\":[{\"attr\":\"DiskSpace\",\"op\":\"IS\",\"val\":\"NULL\"}],\"sort_field\":\"Id\",\"sort_asc\":\"1\",\"limit\":\"100\"}',1,1)"
+    "INSERT INTO Filters (Name,Query,UpdateDiskSpace,Background) values ('Update DiskSpace','{\"terms\":[{\"attr\":\"DiskSpace\",\"op\":\"IS\",\"val\":\"NULL\"}]}',1,1)"
     ));
 
 PREPARE stmt FROM @s;