refs #250, fix initial sync of big transactions and their queries
Merge branch 'diverge'