improve the fix on the broken execute query transaction

should now do the same as before, but with working rollback and commit