Fix issue of searching time out