diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index 30a0de76fc690bd12b34f3d6b76acc5903503867..8099effc2e9440bd138d5853f2c0064991be66d3 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -308,10 +308,8 @@ void tscSaveSubscriptionProgress(void* sub) {
 
   char path[256];
   sprintf(path, "%s/subscribe", tsDataDir);
-  if (access(path, 0) != 0) {
-    if (mkdir(path, 0777) != 0 && errno != EEXIST) {
-      tscError("failed to create subscribe dir: %s", path);
-    }
+  if (tmkdir(path, 0777) != 0) {
+    tscError("failed to create subscribe dir: %s", path);
   }
 
   sprintf(path, "%s/subscribe/%s", tsDataDir, pSub->topic);
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 168d3ee18a830f9e279fbd53f364ee0c0cc93ab8..6b0224cad2391c55d4e0353f83bfcc7b6339ca07 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -788,6 +788,9 @@ static int tsdbAddTableToMeta(STsdbRepo *pRepo, STable *pTable, bool addIdx) {
   }
 
   if (addIdx && tsdbUnlockRepoMeta(pRepo) < 0) return -1;
+  if (TABLE_TYPE(pTable) == TSDB_STREAM_TABLE && addIdx) {
+    pTable->cqhandle = (*pRepo->appH.cqCreateFunc)(pRepo->appH.cqH, TABLE_UID(pTable), TABLE_TID(pTable), pTable->sql, tsdbGetTableSchema(pTable));
+  }
 
   tsdbTrace("vgId:%d table %s tid %d uid %" PRIu64 " is added to meta", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
             TABLE_TID(pTable), TABLE_UID(pTable));
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 78576f80f7a7138848902f6bbcf70049ddbf0982..e0438bfbfdcf90ebb5b1be8935078b6bd1f383c5 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -193,7 +193,7 @@ TsdbQueryHandleT* tsdbQueryTables(TSDB_REPO_T* tsdb, STsdbQueryCond* pCond, STab
       };
       
       assert(info.pTableObj != NULL && (info.pTableObj->type == TSDB_NORMAL_TABLE ||
-      info.pTableObj->type == TSDB_CHILD_TABLE));
+      info.pTableObj->type == TSDB_CHILD_TABLE || info.pTableObj->type == TSDB_STREAM_TABLE));
 
       taosArrayPush(pQueryHandle->pTableCheckInfo, &info);
     }
@@ -2236,7 +2236,7 @@ int32_t tsdbGetOneTableGroup(TSDB_REPO_T* tsdb, uint64_t uid, STableGroupInfo* p
     goto _error;
   }
 
-  assert(pTable->type == TSDB_CHILD_TABLE || pTable->type == TSDB_NORMAL_TABLE);
+  assert(pTable->type == TSDB_CHILD_TABLE || pTable->type == TSDB_NORMAL_TABLE || pTable->type == TSDB_STREAM_TABLE);
   tsdbRefTable(pTable);
   if (tsdbUnlockRepoMeta(tsdb) < 0) goto _error;