diff --git a/tests/script/tsim/parser/limit2_query.sim b/tests/script/tsim/parser/limit2_query.sim
index fc69035935..3c5002d591 100644
--- a/tests/script/tsim/parser/limit2_query.sim
+++ b/tests/script/tsim/parser/limit2_query.sim
@@ -80,7 +80,7 @@ endi
 sql_error select count(*) from $stb where t1 like 1
 
 ##### aggregation on tb + where + fill + limit offset
-sql select _wstart, max(c1) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit 10 offset 1
+sql select _wstart, max(c1) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1) limit 10 offset 1
 if $rows != 10 then
   return -1
 endi
@@ -101,32 +101,26 @@ if $data91 != 5 then
 endi
 
 $tb5 = $tbPrefix . 5
-sql select max(c1), min(c2) from $tb5 where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4) limit 10 offset 1
+sql select max(c1), min(c2) from $tb5 where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit 10 offset 1
 if $rows != 10 then
   return -1
 endi
-if $data00 != @18-09-17 09:05:00.000@ then
+if $data00 != -1 then
   return -1
 endi
-if $data01 != -1 then
+if $data01 != -2 then
   return -1
 endi
-if $data02 != -2 then
+if $data10 != 1 then
   return -1
 endi
-if $data11 != 1 then
+if $data11 != -2 then
   return -1
 endi
-if $data12 != -2 then
+if $data90 != 5 then
   return -1
 endi
-if $data90 != @18-09-17 09:50:00.000@ then
-  return -1
-endi
-if $data91 != 5 then
-  return -1
-endi
-if $data92 != -2 then
+if $data91 != -2 then
   return -1
 endi
 
@@ -135,7 +129,7 @@ endi
 $tb = $tbPrefix . 0
 $limit = $rowNum
 $offset = $limit / 2
-sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit $limit offset $offset
+sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2 ,-3, -4 , -5, -6 ,-7 ,'-8', '-9') limit $limit offset $offset
 if $rows != $limit then
   print expect $limit, actual $rows
   return -1
@@ -143,11 +137,8 @@ endi
 if $data01 != 0 then
   return -1
 endi
-if $data11 != -1 then
-  return -1
-endi
 
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 8200
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 8200
 if $rows != 8200 then
   return -1
 endi
@@ -155,88 +146,56 @@ endi
 sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 100000;
 
 
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 10 offset 8190;
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 10 offset 8190;
 if $rows != 10 then
   return -1
 endi
 
-if $data00 != @18-10-15 19:30:00.000@ then
+if $data00 != 5 then
   return -1
 endi
 
-if $data01 != 5 then
+if $data10 != -1000 then
   return -1
 endi
 
-if $data10 != @18-10-15 19:35:00.000@ then
+if $data20 != 6 then
   return -1
 endi
 
-if $data11 != -1000 then
+if $data30 != -1000 then
   return -1
 endi
 
-if $data20 != @18-10-15 19:40:00.000@ then
-  return -1
-endi
-
-if $data21 != 6 then
-  return -1
-endi
-
-if $data30 != @18-10-15 19:45:00.000@ then
-  return -1
-endi
-
-if $data31 != -1000 then
-  return -1
-endi
-
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 10 offset 10001;
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 10 offset 10001;
 if $rows != 10 then
   return -1
 endi
 
-if $data00 != @18-10-22 02:25:00.000@ then
+if $data00 != -1000 then
   return -1
 endi
 
-if $data01 != -1000 then
+if $data10 != 1 then
   return -1
 endi
 
-if $data10 != @18-10-22 02:30:00.000@ then
+if $data20 != -1000 then
   return -1
 endi
 
-if $data11 != 1 then
+if $data30 != 2 then
   return -1
 endi
 
-if $data20 != @18-10-22 02:35:00.000@ then
-  return -1
-endi
-
-if $data21 != -1000 then
-  return -1
-endi
-
-if $data30 != @18-10-22 02:40:00.000@ then
-  return -1
-endi
-
-if $data31 != 2 then
-  return -1
-endi
-
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 10000 offset 10001;
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 10000 offset 10001;
 print ====> needs to validate the last row result
 if $rows != 9998 then
   return -1
 endi
 
 
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 100 offset 20001;
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 100 offset 20001;
 if $rows != 0 then
   return -1
 endi
@@ -244,7 +203,7 @@ endi
 # tb + interval + fill(linear) + limit offset
 $limit = $rowNum
 $offset = $limit / 2
-sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear) limit $limit offset $offset
+sql select _wstart,max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear) limit $limit offset $offset
 if $rows != $limit then
   print expect $limit, actual $rows
   return -1
@@ -290,7 +249,7 @@ endi
 $limit = $rowNum
 $offset = $limit / 2
 $offset = $offset + 10
-sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2) limit $limit offset $offset
+sql select _wstart,max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2 ,-3, -4 , -5, -6 ,-7 ,'-8', '-9') limit $limit offset $offset
 if $rows != $limit then
   return -1
 endi
@@ -324,20 +283,11 @@ endi
 if $data19 != NULL then
   return -1
 endi
-if $data16 != -2.000000000 then
-  return -1
-endi
-if $data17 != 1 then
-  return -1
-endi
-if $data11 != -1 then
-  return -1
-endi
 
 $limit = $rowNum
 $offset = $limit * 2
 $offset = $offset - 11
-sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2) limit $limit offset $offset
+sql select _wstart,max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2 ,-3, -4 , -5, -6 ,-7 ,'-8', '-9') limit $limit offset $offset
 if $rows != 10 then
   return -1
 endi
@@ -368,27 +318,21 @@ endi
 if $data19 != nchar5 then
   return -1
 endi
-if $data27 != 1 then
-  return -1
-endi
-if $data38 != NULL then
-  return -1
-endi
-if $data49 != NULL then
-  return -1
-endi
 
 ### [TBASE-350]
 ## stb + interval + fill + group by + limit offset
-sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) group by t1 limit 2 offset 10
-if $rows != 20 then
+sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(value, -1, -2, -3, -4 ,-7 ,'-8', '-9') limit 2 offset 10
+if $rows != 2 then
   return -1
 endi
+#add one more test case
+sql select max(c1), last(c8) from lm2_db0.lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(linear) limit 10 offset 4089;"
+
 
 $limit = 5
 $offset = $rowNum * 2
 $offset = $offset - 2
-sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) group by t1 order by t1 limit $limit offset $offset
+sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(value, -1, -2, -3, -4 ,-7 ,'-8', '-9') order by t1 limit $limit offset $offset
 if $rows != $tbNum then
   return -1
 endi