diff --git a/datastore/backend.nim b/datastore/backend.nim
index 59a9bf3..9a9dc8b 100644
--- a/datastore/backend.nim
+++ b/datastore/backend.nim
@@ -10,7 +10,7 @@ import ./key
 import ./types
 
 export databuffer, threadresult, semaphore, types
-export upraises, results
+export upraises, results, SortOrder
 
 type
   KeyId* = object
@@ -29,7 +29,7 @@ type
     offset*: int      # Offset from which to start querying - not available in all backends
     sort*: SortOrder  # Sort order - not available in all backends
 
-  DbQueryResponse* = tuple[key: Option[string], data: seq[byte]] | tuple[key: Option[KeyId], data: DataBuffer]
+  DbQueryResponse* = tuple[key: Option[KeyId], val: DataBuffer]
 
 proc `$`*(id: KeyId): string = $(id.data)
 
diff --git a/datastore/sql/sqliteds.nim b/datastore/sql/sqliteds.nim
index 13dd585..a1a5279 100644
--- a/datastore/sql/sqliteds.nim
+++ b/datastore/sql/sqliteds.nim
@@ -104,11 +104,10 @@ proc close*(self: SQLiteDatastore): ?!void =
 
 
 iterator query*(self: SQLiteDatastore,
-              query: Query
-              ): ?!ThreadQueryRes =
+                query: DbQuery
+                ): ?!DbQueryResponse {.closure.} =
 
   var
-    iter = QueryIter()
     queryStr = if query.value:
         QueryStmtDataIdStr
       else: