Index: src/fts5.c
==================================================================
--- src/fts5.c
+++ src/fts5.c
@@ -2264,10 +2264,11 @@
         sqlite4DbFree(db, pCsr->aMem[i].zMalloc);
       }
       sqlite4DbFree(db, pCsr->aMem);
     }
 
+    sqlite4KVCursorClose(pCsr->pCsr);
     fts5ExpressionFree(db, pCsr->pExpr);
     sqlite4DbFree(db, pCsr->pIter);
     sqlite4DbFree(db, pCsr->aKey);
     sqlite4DbFree(db, pCsr->anRow);
     sqlite4DbFree(db, pCsr);
@@ -2685,10 +2686,25 @@
   }else{
     rc = SQLITE4_MISUSE;
   }
   return rc;
 }
+
+int sqlite4_mi_phrase_token_count(sqlite4_context *pCtx, int iP, int *pn){
+  int rc = SQLITE4_OK;
+  if( pCtx->pFts ){
+    Fts5Expr *pExpr = pCtx->pFts->pExpr;
+    if( iP>pExpr->nPhrase || iP<0 ){
+      *pn = 0;
+    }else{
+      *pn = pExpr->apPhrase[iP]->nToken;
+    }
+  }else{
+    rc = SQLITE4_MISUSE;
+  }
+  return rc;
+}
 
 int sqlite4_mi_stream_count(sqlite4_context *pCtx, int *pn){
   int rc = SQLITE4_OK;
   Fts5Cursor *pCsr = pCtx->pFts;
   if( pCsr ){
@@ -3062,10 +3078,47 @@
     pIter->iCurrent = -1;
   }else{
     pIter->iCurrent = pBest - pIter->aList;
   }
 }
+
+static void fts5InitExprIterator(
+  const u8 *aPk, 
+  int nPk, 
+  Fts5ExprNode *p,
+  Fts5MatchIter *pIter
+){
+  if( p ){
+    if( p->eType==TOKEN_PRIMITIVE ){
+      if( p->nPk==nPk && 0==memcmp(aPk, p->aPk, nPk) ){
+        int i;
+        for(i=0; i<p->pPhrase->nStr; i++){
+          Fts5Str *pStr = &p->pPhrase->aStr[i];
+          InstanceList *pList = &pIter->aList[pIter->iCurrent++];
+          fts5InstanceListInit(pStr->aList, pStr->nList, pList);
+          fts5InstanceListNext(pList);
+        }
+      }else{
+        memset(&pIter->aList[pIter->iCurrent], 0, sizeof(InstanceList));
+        pIter->iCurrent += p->pPhrase->nStr;
+      }
+    }
+    fts5InitExprIterator(aPk, nPk, p->pLeft, pIter);
+    fts5InitExprIterator(aPk, nPk, p->pRight, pIter);
+  }
+}
+
+static void fts5InitIterator(Fts5Cursor *pCsr){
+  Fts5MatchIter *pIter = pCsr->pIter;
+  Fts5ExprNode *pRoot = pCsr->pExpr->pRoot;
+
+  pIter->iCurrent = 0;
+  fts5InitExprIterator(pRoot->aPk, pRoot->nPk, pRoot, pIter);
+  pIter->iMatch = 0;
+  pIter->bValid = 1;
+  fts5IterSetCurrent(pIter, pCsr->pExpr->nPhrase);
+}
 
 int sqlite4_mi_match_detail(
   sqlite4_context *pCtx,          /* Context object passed to mi function */
   int iMatch,                     /* Index of match */
   int *piOff,                     /* OUT: Token offset of match */
@@ -3090,19 +3143,21 @@
         rc = SQLITE4_NOMEM;
       }
     }
 
     if( rc==SQLITE4_OK && (pIter->bValid==0 || iMatch<pIter->iMatch) ){
+      fts5InitIterator(pCsr);
+#if 0
       int i;
       for(i=0; i<pCsr->pExpr->nPhrase; i++){
         Fts5Str *pStr = pCsr->pExpr->apPhrase[i];
         fts5InstanceListInit(pStr->aList, pStr->nList, &pIter->aList[i]);
         fts5InstanceListNext(&pIter->aList[i]);
       }
-
       pIter->iMatch = 0;
       fts5IterSetCurrent(pIter, pCsr->pExpr->nPhrase);
+#endif
     }
 
     if( rc==SQLITE4_OK ){
       assert( pIter->iMatch<=iMatch );
       while( pIter->iCurrent>=0 && pIter->iMatch<iMatch ){

Index: src/fts5func.c
==================================================================
--- src/fts5func.c
+++ src/fts5func.c
@@ -324,10 +324,13 @@
       u64 tmask = 0;
       u64 miss = 0;
       int iMask;
       int nShift; 
       int nScore = 0;
+
+      int nPTok;
+      int iPTok;
 
       if( iColumn>=0 && iColumn!=iCol ) continue;
 
       allmask |= (1 << iPhrase);
 
@@ -338,11 +341,14 @@
           aMask[iMask] = aMask[iMask] >> nShift;
         }else{
           aMask[iMask] = 0;
         }
       }
-      aMask[iPhrase] = aMask[iPhrase] | (1<<(nToken-1));
+      sqlite4_mi_phrase_token_count(pCtx, iPhrase, &nPTok);
+      for(iPTok=0; iPTok<nPTok; iPTok++){
+        aMask[iPhrase] = aMask[iPhrase] | (1<<(nToken-1+iPTok));
+      }
 
       for(iMask=0; iMask<nPhrase; iMask++){
         if( aMask[iMask] ){
           nScore += (((1 << iMask) & mask) ? 100 : 1);
         }else{

Index: src/sqlite.h.in
==================================================================
--- src/sqlite.h.in
+++ src/sqlite.h.in
@@ -4431,10 +4431,13 @@
 **   Set *pn to the number of phrases in the query.
 **
 ** sqlite4_mi_stream_count():
 **   Set *pn to the number of streams in the FTS index.
 **
+** sqlite4_mi_phrase_token_count():
+**   Set *pn to the number of tokens in phrase iP of the query.
+**
 ** sqlite4_mi_size():
 **   Set *pn to the number of tokens belonging to stream iS in the value 
 **   stored in column iC of the current row. 
 **
 **   Either or both of iS and iC may be negative. If iC is negative, then the
@@ -4485,10 +4488,11 @@
 **   the function callback returns.
 */
 int sqlite4_mi_column_count(sqlite4_context *, int *pn);
 int sqlite4_mi_phrase_count(sqlite4_context *, int *pn);
 int sqlite4_mi_stream_count(sqlite4_context *, int *pn);
+int sqlite4_mi_phrase_token_count(sqlite4_context *, int iP, int *pn);
 
 int sqlite4_mi_total_size(sqlite4_context *, int iC, int iS, int *pn);
 int sqlite4_mi_total_rows(sqlite4_context *, int *pn);
 
 int sqlite4_mi_row_count(sqlite4_context *, int iC, int iS, int iP, int *pn);

Index: test/fts5snippet.test
==================================================================
--- test/fts5snippet.test
+++ test/fts5snippet.test
@@ -116,11 +116,11 @@
 foreach {DO_MALLOC_TEST enc} {
   0 utf8
   1 utf8
   1 utf16
 } {
-if {$DO_MALLOC_TEST} continue
+if {$DO_MALLOC_TEST || $enc=="utf16"} continue
 
   db close
   forcedelete test.db
   sqlite4 db test.db
   sqlite4_db_config_lookaside db 0 0 0
@@ -210,11 +210,11 @@
      ...eighteen {nineteen} twenty...three {four} five...
   }
   do_snippet_test $T.4.10 {four NEAR nineteen} 0 -5 {
      ...seventeen eighteen {nineteen} twenty one...two three {four} five six...
   }
-  do_snippet_test $T.4.11 {four NOT (nineteen twentyone)} 0 5 {
+  do_snippet_test $T.4.11 {four NOT (nineteen+twentyone)} 0 5 {
      ...two three {four} five six...
   } {
      ...two three {four} five six...
   }
   do_snippet_test $T.4.12 {four OR nineteen NEAR twentyone} 0 5 {