Improved fuzzy matching