fix hangs and lost search results
Merge remote-tracking branch 'origin/master'