diff --git a/numass-main/src/main/kotlin/inr/numass/NumassUtils.kt b/numass-main/src/main/kotlin/inr/numass/NumassUtils.kt
index e6612c8b..8baf85de 100644
--- a/numass-main/src/main/kotlin/inr/numass/NumassUtils.kt
+++ b/numass-main/src/main/kotlin/inr/numass/NumassUtils.kt
@@ -181,8 +181,8 @@ fun addSetMarkers(frame: JFreeChartFrame, sets: Collection<NumassSet>) {
     sets.stream().forEach {
         val start = it.startTime;
         val stop = it.meta.optValue("end_time").map { it.timeValue() }
-                .orElse(start.plusSeconds(3600))
-                .minusSeconds(30)
+                .orElse(start.plusSeconds(300))
+                .minusSeconds(60)
         val marker = IntervalMarker(start.toEpochMilli().toDouble(), stop.toEpochMilli().toDouble(), paint)
         marker.label = it.name
         marker.labelFont = Font("Verdana", Font.BOLD, 20);
diff --git a/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt b/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
index 627be4bd..705756bc 100644
--- a/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
+++ b/numass-main/src/main/kotlin/inr/numass/tasks/NumassTasks.kt
@@ -17,7 +17,7 @@ import inr.numass.data.analyzers.SmartAnalyzer
 import inr.numass.data.api.NumassSet
 
 val selectDataTask = task("select") {
-    model {
+    model { meta ->
         data("*")
         configure(meta.getMetaOrEmpty("data"))
     }
@@ -27,9 +27,9 @@ val selectDataTask = task("select") {
 }
 
 val monitorTableTask = task("monitor") {
-    model {
-        configure(meta.getMetaOrEmpty("analyzer"))
+    model { meta ->
         dependsOn("select", meta)
+        configure(meta.getMetaOrEmpty("analyzer"))
     }
     join<NumassSet, Table> {
         result { data ->