diff --git a/pkger/parser_models.go b/pkger/parser_models.go
index a43b7c45555..650f388319f 100644
--- a/pkger/parser_models.go
+++ b/pkger/parser_models.go
@@ -2344,7 +2344,11 @@ func astDurationFromIface(v interface{}) *ast.DurationLiteral {
 		}
 		s = d.String()
 	}
-	dur, _ := parser.ParseSignedDuration(s)
+
+	dur, err := parser.ParseSignedDuration(s)
+	if err != nil {
+		dur, _ = parser.ParseSignedDuration("-0m")
+	}
 	return dur
 }
 
@@ -2385,7 +2389,10 @@ func astTimeFromIface(v interface{}) *ast.DateTimeLiteral {
 		return nil
 	}
 
-	t, _ := parser.ParseTime(s)
+	t, err := parser.ParseTime(s)
+	if err != nil {
+		return ast.DateTimeLiteralFromValue(time.Now())
+	}
 	return t
 }
 
diff --git a/pkger/parser_test.go b/pkger/parser_test.go
index 1bf1d5166e2..73fbfd9d128 100644
--- a/pkger/parser_test.go
+++ b/pkger/parser_test.go
@@ -2431,7 +2431,7 @@ spec:
 }
 
 from(bucket: params.bucket)
-	|> range(start: params.start, end: params.stop)
+	|> range(start: params.start, stop: params.stop)
 	|> filter(fn: (r) =>
 		(r._measurement == "processes"))
 	|> filter(fn: (r) =>
@@ -3431,7 +3431,7 @@ spec:
 }
 
 from(bucket: params.bucket)
-	|> range(start: params.start, end: params.stop)
+	|> range(start: params.start, stop: params.stop)
 	|> filter(fn: (r) =>
 		(r._measurement == "processes"))
 	|> filter(fn: (r) =>
diff --git a/pkger/testdata/dashboard_params.yml b/pkger/testdata/dashboard_params.yml
index ca883512162..f83a1e26185 100644
--- a/pkger/testdata/dashboard_params.yml
+++ b/pkger/testdata/dashboard_params.yml
@@ -22,7 +22,7 @@ spec:
             }
 
             from(bucket: params.bucket)
-              |> range(start: params.start, end: params.stop)
+              |> range(start: params.start, stop: params.stop)
               |> filter(fn: (r) => r._measurement == "processes")
               |> filter(fn: (r) => r.floater == params.floatVal)
               |> filter(fn: (r) => r._value > params.minVal)
diff --git a/pkger/testdata/tasks_params.yml b/pkger/testdata/tasks_params.yml
index be7d1b0a57c..77f4e1c2bf0 100644
--- a/pkger/testdata/tasks_params.yml
+++ b/pkger/testdata/tasks_params.yml
@@ -15,7 +15,7 @@ spec:
     }
 
     from(bucket: params.bucket)
-      |> range(start: params.start, end: params.stop)
+      |> range(start: params.start, stop: params.stop)
       |> filter(fn: (r) => r._measurement == "processes")
       |> filter(fn: (r) => r.floater == params.floatVal)
       |> filter(fn: (r) => r._value > params.minVal)