Fixes to fuzzy search