Query cancellation & timeout

probably left over from some testing when Guice wasn't happy