Query cancellation & timeout

can use the noop query watcher here as well :)