diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 3d47973f6784e1d8e8fd7a7bcc4dba89e06f1dd2..b2f9f25d8010f940945bee67277a8f00c55f3ee9 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -5193,7 +5193,7 @@ char* parseTagDatatoJson(void *p){
       ASSERT(jsonVal == TSDB_DATA_BINARY_PLACEHOLDER);
       continue;
     }
-    if (j%2 == 0) { // json key
+    if (j%2 != 0) { // json key
       memset(tagJsonKey, 0, TSDB_MAX_TAGS_LEN);
       int32_t length = taosUcs4ToMbs(varDataVal(val), varDataLen(val), tagJsonKey);
       if (length == 0) {
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index b12056554104c965e63d000264b0982c37bdbcc3..aa1131dfa598a3c2708f24dae0179383684d9093 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -3341,7 +3341,7 @@ static void doSetTagValueInParam(void* pTable, int32_t tagColId, tVariant *tag,
     val = tsdbGetTableName(pTable);
     assert(val != NULL);
   } else {
-    val = tsdbGetTableTagVal(pTable, tagColId, type, bytes);
+    val = tsdbGetTableTagVal(pTable, tagColId, type, bytes);      // todo json
   }
 
   if (val == NULL || isNull(val, type)) {