diff --git a/src/helperFuncs.js b/src/helperFuncs.js
index abae7d0..df9915d 100644
--- a/src/helperFuncs.js
+++ b/src/helperFuncs.js
@@ -83,7 +83,7 @@ function createLineup(obj, channel, fillers, isFirst) {
             if ( (channel.offlineMode === 'clip') && (channel.fallback.length != 0) ) {
                 special = JSON.parse(JSON.stringify(channel.fallback[0]));
             }
-            let randomResult = pickRandomWithMaxDuration(channel, fillers, remaining + (isFirst? (24*60*60*1000) : 0) );
+            let randomResult = pickRandomWithMaxDuration(channel, fillers, remaining + (isFirst? (7*24*60*60*1000) : 0) );
             filler = randomResult.filler;
             if (filler == null && (typeof(randomResult.minimumWait) !== undefined) && (remaining > randomResult.minimumWait) ) {
                 remaining = randomResult.minimumWait;
@@ -169,7 +169,7 @@ function pickRandomWithMaxDuration(channel, fillers, maxDuration) {
     let pick2 = null;
     let t0 = (new Date()).getTime();
     let minimumWait = 1000000000;
-    const D = 24*60*60*1000;
+    const D = 7*24*60*60*1000;
     if (typeof(channel.fillerRepeatCooldown) === 'undefined') {
         channel.fillerRepeatCooldown = 30*60*1000;
     }
diff --git a/web/directives/channel-config.js b/web/directives/channel-config.js
index 37f139a..92e0b19 100644
--- a/web/directives/channel-config.js
+++ b/web/directives/channel-config.js
@@ -1454,6 +1454,7 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions) {
             scope.rerunBlockSize = -1;
             scope.rerunBlockSizes = [
                 { id: -1, description: "Block" },
+                { id: 4, description: "4 Hours" },
                 { id: 6, description: "6 Hours" },
                 { id: 8, description: "8 Hours" },
                 { id: 12, description: "12 Hours" },
@@ -1464,6 +1465,7 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions) {
                 { id: 2, description: "2" },
                 { id: 3, description: "3" },
                 { id: 4, description: "4" },
+                { id: 6, description: "6" },
             ];
             scope.rerunsDisabled = () => {
                 return scope.rerunStart == -1 || scope.rerunBlockSize == -1 || scope.rerunRepeats == -1