add timeouts, stopping of stream queries