diff --git a/cmd/tsbs_load_iotdb/process.go b/cmd/tsbs_load_iotdb/process.go
index 14e9b22ba..b1a4827af 100644
--- a/cmd/tsbs_load_iotdb/process.go
+++ b/cmd/tsbs_load_iotdb/process.go
@@ -168,7 +168,12 @@ func (p *processor) ProcessBatch(b targets.Batch, doLoad bool) (metricCount, row
 						kvString = kvString + "," + kv
 					}
 				}
-				sql := fmt.Sprintf("CREATE ALIGNED TIMESERIES %s(_tags INT32 tags(%s)) ", fullDevice, kvString)
+				var sql string
+				if useAlignedTimeseries {
+					sql = fmt.Sprintf("CREATE ALIGNED TIMESERIES %s(_tags INT32 tags(%s)) ", fullDevice, kvString)
+				} else {
+					sql = fmt.Sprintf("CREATE TIMESERIES %s(_tags INT32 tags(%s)) ", fullDevice, kvString)
+				}
 				_, err := p.session.ExecuteStatement(sql)
 				if err != nil {
 					fatal("ExecuteStatement CREATE timeseries with tags error: %v", err)
diff --git a/cmd/tsbs_run_queries_iotdb/main.go b/cmd/tsbs_run_queries_iotdb/main.go
index 8b35eb58b..03cc12b47 100644
--- a/cmd/tsbs_run_queries_iotdb/main.go
+++ b/cmd/tsbs_run_queries_iotdb/main.go
@@ -133,9 +133,8 @@ func (p *processor) ProcessQuery(q query.Query, _ bool) ([]*query.Stat, error) {
 
 			if err == nil {
 				if p.printResponses {
-					sql = fmt.Sprintf("Response for ExecuteGroupByQueryIntervalQuery, "+
-						"db: %s, device: %s, measurement: %s, startTime: %d, endTime: %d",
-						db, device, measurement, startTimeInMills, endTimeInMills)
+					sql = fmt.Sprintf("select max_value(%s) from %s group by ([%d,%d), 60s)",
+						measurement, device, startTimeInMills, endTimeInMills)
 					printDataSet(sql, dataSet)
 				}
 			}
@@ -151,13 +150,11 @@ func (p *processor) ProcessQuery(q query.Query, _ bool) ([]*query.Stat, error) {
 				return nil, err
 			}
 
-			if err == nil {
-				if p.printResponses {
-					sql = fmt.Sprintf("Response for ExecuteAggregationQueryWithLegalNodes, "+
-						"aggregatePaths: %s, startTime: %d, endTime: %d\n",
-						aggregatePaths, startTimeInMills, endTimeInMills)
-					printDataSet(sql, dataSet)
-				}
+			if p.printResponses {
+				sql = fmt.Sprintf("Response for ExecuteAggregationQueryWithLegalNodes, "+
+					"aggregatePaths: %s, startTime: %d, endTime: %d\n",
+					aggregatePaths, startTimeInMills, endTimeInMills)
+				printDataSet(sql, dataSet)
 			}
 		}
 	} else {
@@ -169,15 +166,8 @@ func (p *processor) ProcessQuery(q query.Query, _ bool) ([]*query.Stat, error) {
 		return nil, err
 	}
 
-	if err == nil {
-		if p.printResponses {
-			printDataSet(string(iotdbQ.SqlQuery), dataSet)
-		}
-	}
 	took := time.Now().UnixNano() - start
 
-	defer dataSet.Close()
-
 	lag := float64(took) / float64(time.Millisecond) // in milliseconds
 	stat := query.GetStat()
 	stat.Init(q.HumanLabelName(), lag)