Improved fuzzy string matching