Query cancellation & timeout

we use empty querywatchers in a lot of places