Query cancellation & timeout

I think you can just propagate e