Improve search (make fuzzy again and more robust)

Improve search (make fuzzy again and more robust) #2892