Query cancellation & timeout

we also need changes on the AsyncQueryServlet