diff --git a/datastore/threads/threadproxyds.nim b/datastore/threads/threadproxyds.nim
index c015491..ffba89f 100644
--- a/datastore/threads/threadproxyds.nim
+++ b/datastore/threads/threadproxyds.nim
@@ -252,28 +252,23 @@ proc queryTask[DB](
     nextSignal: ThreadSignalPtr
 ) {.gcsafe, nimcall.} =
   ## run query command
-  echo "\n\tqueryTask:init"
   executeTask(ctx):
-    echo "\tqueryTask:exec:"
     # we execute this all inside `executeTask`
     # so we need to return a final result
     let handleRes = ds.query(query)
-    echo "\tqueryTask:query: ", handleRes
     if handleRes.isErr():
       # set error and exit executeTask, which will fire final signal
       echo "\tqueryTask:query:err "
       (?!QResult).err(handleRes.error())
     else:
-      echo "\tqueryTask:query:ok "
       # otherwise manually an set empty ok result
       ctx[].res.ok (KeyId.none, DataBuffer(), )
-      discard ctx[].signal.fireSync()
       echo "\tqueryTask:query:fireSync "
+      discard ctx[].signal.fireSync()
 
       var handle = handleRes.get()
       for item in handle.iter():
         # wait for next request from async thread
-        echo "\tqueryTask:query:iter:wait! "
 
         if ctx[].cancelled:
           echo "\tqueryTask:query:iter:cancelled"
@@ -286,6 +281,8 @@ proc queryTask[DB](
           echo "\tqueryTask:query:iter:result: ", ctx[].res
           echo "\tqueryTask:query:iter:fireSync "
           discard ctx[].signal.fireSync()
+
+          echo "\tqueryTask:query:iter:nextSignal:wait! "
           discard nextSignal.waitSync().get()
 
       # set final result
@@ -320,13 +317,13 @@ method query*(
     lock = newAsyncLock() # serialize querying under threads
     iter = QueryIter.new()
 
-  echo "query:first:iter:dispatch"
-  await nextSignal.fire()
+  # echo "query:first:iter:dispatch"
+  # await nextSignal.fire()
 
-  echo "query:next:ready: "
+  echo "query:first:ready!\n"
 
   proc next(): Future[?!QueryResponse] {.async.} =
-    echo "query:next:exec: "
+    echo "\n\nquery:next:exec: "
     let ctx = ctx
     defer:
       if lock.locked:
@@ -351,6 +348,9 @@ method query*(
       # return
 
     echo "query:next:iter:res: ", ctx[].res, "\n"
+    defer:
+      echo "query:iter:nextSignal:fire!"
+      await nextSignal.fire()
 
     if ctx[].res.isErr():
       return err(ctx[].res.error())
@@ -360,8 +360,6 @@ method query*(
       let data = qres.data.toSeq()
       return (?!QueryResponse).ok((key: key, data: data))
 
-    echo "query:next:iter:dispatch"
-    await nextSignal.fire()
 
   iter.next = next
   return success iter