diff --git a/include/common/ttypes.h b/include/common/ttypes.h
index 4c23f0fa06f8cc5f4d3ec1bffa1770c6b9441e57..39a5f0e2b8a42f96390b060929c9c4bcd10beeb6 100644
--- a/include/common/ttypes.h
+++ b/include/common/ttypes.h
@@ -106,6 +106,7 @@ typedef struct {
         *(uint16_t *)(_v) = (uint16_t)(_data); \
         break;                                 \
       case TSDB_DATA_TYPE_BIGINT:              \
+      case TSDB_DATA_TYPE_TIMESTAMP:           \
         *(int64_t *)(_v) = (int64_t)(_data);   \
         break;                                 \
       case TSDB_DATA_TYPE_UBIGINT:             \
diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index d130c8dae4e7beebc74fdfc51018e2f74d6e0a1c..6017958cf0ebc5048564cd508cbe34a804cc2cac 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -1044,6 +1044,8 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode* tree, SArray *group) {
       filterAddUnitToGroup(&fgroup, uidx);
       
       taosArrayPush(group, &fgroup);
+
+      cell = cell->pNext;
     }
   } else {
     filterAddFieldFromNode(info, node->pRight, &right);
@@ -1312,6 +1314,8 @@ EDealRes fltTreeToGroup(SNode* pNode, void* pContext) {
         
         preGroup = resGroup;
         resGroup = NULL;
+
+        cell = cell->pNext;
       }
 
       taosArrayAddAll(ctx->group, preGroup);
@@ -1326,6 +1330,8 @@ EDealRes fltTreeToGroup(SNode* pNode, void* pContext) {
       for (int32_t i = 0; i < node->pParameterList->length; ++i) {
         nodesWalkNode(cell->pNode, fltTreeToGroup, (void *)pContext);
         FLT_ERR_JRET(ctx->code);
+        
+        cell = cell->pNext;
       }
       
       return DEAL_RES_IGNORE_CHILD;