diff --git a/src/system/detail/src/vnodeQueryImpl.c b/src/system/detail/src/vnodeQueryImpl.c
index e69b5a5b8cf0cc49ada67f44ec5d4eb17b7eff57..5439a1e56c7c0439d53a6f8dd767c5372c9195b7 100644
--- a/src/system/detail/src/vnodeQueryImpl.c
+++ b/src/system/detail/src/vnodeQueryImpl.c
@@ -4021,7 +4021,7 @@ bool normalizedFirstQueryRange(bool dataInDisk, bool dataInCache, STableQuerySup
       }
       
       // needs the data before the begin timestamp of query time window
-      if (nextKey != pQuery->skey) {
+      if ((nextKey != pQuery->skey) && (!isPointInterpoQuery(pQuery))) {
         if (!pRuntimeEnv->hasTimeWindow) {
           pQuery->skey = nextKey;  // change the query skey
           pQuery->lastKey = pQuery->skey;
diff --git a/src/util/src/tnote.c b/src/util/src/tnote.c
index 7a133590d2a450d8e8b688bc63515c0ad9e81912..1a1b3a644de580b0fc26bb6aa459635a86ed5204 100644
--- a/src/util/src/tnote.c
+++ b/src/util/src/tnote.c
@@ -77,7 +77,7 @@ void taosUnLockNote(int fd, taosNoteInfo * pNote)
 
 void *taosThreadToOpenNewNote(void *param)
 {
-    char name[NOTE_FILE_NAME_LEN];
+    char name[NOTE_FILE_NAME_LEN + 16];
     taosNoteInfo * pNote = (taosNoteInfo *)param;
 
     pNote->taosNoteFlag ^= 1;
@@ -170,7 +170,7 @@ void taosGetNoteName(char *fn, taosNoteInfo * pNote)
 
 int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInfo * pNote)
 {
-    char name[NOTE_FILE_NAME_LEN] = "\0";
+    char name[NOTE_FILE_NAME_LEN + 16] = "\0";
     struct stat  notestat0, notestat1;
     int size;