diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index be304632ccdcd7c11ec8c07341378992bb5d67a2..ea2a3d82288318c79fd38f2c3019a70438589ef9 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -54,14 +54,14 @@ void tscAddIntoSqlList(SSqlObj *pSql) {
   pSql->next = pObj->sqlList;
   if (pObj->sqlList) pObj->sqlList->prev = pSql;
   pObj->sqlList = pSql;
-  pSql->queryId = queryId++;
+  pSql->queryId = atomic_fetch_add_32(&queryId, 1);
 
   pthread_mutex_unlock(&pObj->mutex);
 
   pSql->stime = taosGetTimestampMs();
   pSql->listed = 1;
 
-  tscDebug("0x%"PRIx64" added into sqlList", pSql->self);
+  tscDebug("0x%"PRIx64" added into sqlList, queryId:%u", pSql->self, pSql->queryId);
 }
 
 void tscSaveSlowQueryFpCb(void *param, TAOS_RES *result, int code) {
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 547d66a0f37959dfb1efdea25a1f28bc9de09df6..3d2cf445603163e23c17a6946f05ef6e46cef052 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -2431,15 +2431,15 @@ void tscDoQuery(SSqlObj* pSql) {
     return;
   }
   
-  if (pCmd->command == TSDB_SQL_SELECT) {
-    tscAddIntoSqlList(pSql);
-  }
-
   if (pCmd->dataSourceType == DATA_FROM_DATA_FILE) {
     tscImportDataFromFile(pSql);
   } else {
     SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
     uint16_t type = pQueryInfo->type;
+
+    if ((pCmd->command == TSDB_SQL_SELECT) && (!TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_SUBQUERY)) && (!TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_STABLE_SUBQUERY))) {
+      tscAddIntoSqlList(pSql);
+    }
   
     if (TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_INSERT)) {  // multi-vnodes insertion
       tscHandleMultivnodeInsert(pSql);
diff --git a/src/mnode/src/mnodeProfile.c b/src/mnode/src/mnodeProfile.c
index 17a4282d05935684df4ab6585fef5f2398a62979..f0ff016694086586b55c7d1ef633bdbf5ad97851 100644
--- a/src/mnode/src/mnodeProfile.c
+++ b/src/mnode/src/mnodeProfile.c
@@ -123,8 +123,9 @@ SConnObj *mnodeAccquireConn(int32_t connId, char *user, uint32_t ip, uint16_t po
   if (/* pConn->ip != ip || */ pConn->port != port /* || strcmp(pConn->user, user) != 0 */) {
     mDebug("connId:%d, incoming conn user:%s ip:%s:%u, not match exist conn user:%s ip:%s:%u", connId, user,
            taosIpStr(ip), port, pConn->user, taosIpStr(pConn->ip), pConn->port);
-    taosCacheRelease(tsMnodeConnCache, (void **)&pConn, false);
-    return NULL;
+    pConn->port = port;
+    //taosCacheRelease(tsMnodeConnCache, (void **)&pConn, false);
+    //return NULL;
   }
 
   // mDebug("connId:%d, is incoming, user:%s ip:%s:%u", connId, pConn->user, taosIpStr(pConn->ip), pConn->port);
diff --git a/src/mnode/src/mnodeShow.c b/src/mnode/src/mnodeShow.c
index c0fa6368f302387a4cec841215761063be7415d8..5fe22826b7d0a2270300bacc3d1ae8f59d346a54 100644
--- a/src/mnode/src/mnodeShow.c
+++ b/src/mnode/src/mnodeShow.c
@@ -253,10 +253,6 @@ static int32_t mnodeProcessHeartBeatMsg(SMnodeMsg *pMsg) {
     
   int32_t connId = htonl(pHBMsg->connId);
   SConnObj *pConn = mnodeAccquireConn(connId, connInfo.user, connInfo.clientIp, connInfo.clientPort);
-  if (pConn == NULL) {
-    pHBMsg->pid = htonl(pHBMsg->pid);
-    pConn = mnodeCreateConn(connInfo.user, connInfo.clientIp, connInfo.clientPort, pHBMsg->pid, pHBMsg->appName);
-  }
 
   if (pConn == NULL) {
     // do not close existing links, otherwise
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 4cf6d6072ed0267aaec48551f55d27e128377994..eca2a25a35678a772f1e8a787ea73c6cc6930bea 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -124,6 +124,8 @@ int64_t genQueryId(void) {
 
   uid |= sid;
 
+  qDebug("gen qid:0x%"PRIx64, uid);
+
   return uid;
 }