Query  timeout

Related to #710