Improve fuzzy-matching