Added better fuzzy search