diff --git a/kwollect/db/kwollect_setup_db.py b/kwollect/db/kwollect_setup_db.py
index 74e610bb1b1194a6a957233ce9bd12acab8d29dd..a5498bf732f420b44a1c0f24af298cffb7fcbdab 100644
--- a/kwollect/db/kwollect_setup_db.py
+++ b/kwollect/db/kwollect_setup_db.py
@@ -294,7 +294,7 @@ END
 $$;
 SELECT add_job(
   'move_chunks_to_archive', '1d',
-  config => '{"hypertable":"metrics_summary", "lag":"14d", "tablespace":"archive"}',
+  config => '{"hypertable":"metrics_summary", "lag":"8d", "tablespace":"archive"}',
   initial_start => CURRENT_DATE + TIME '23:59:59' AT TIME ZONE current_setting('TIMEZONE')
   );
 """
@@ -343,9 +343,8 @@ if job_id:
     nodetime = plpy.execute("SELECT MIN(start_time) AS start_time, COALESCE(MAX(stop_time), NOW()) AS stop_time, STRING_AGG(node, ',') AS nodes FROM nodetime_by_job WHERE job_id = %s GROUP BY job_id" % job_id)[0]
     if not start_time:
         start_time = nodetime["start_time"]
-    # TODO Fix for running job
     if not end_time:
-        end_time = nodetime["stop_time"]
+        end_time = nodetime["stop_time"] or "now"
     if not _devices:
         _devices = nodetime["nodes"]