TransactionQueryBuilder has been improved