Added timing handling to server query and added handling for server execute