[Feature] Improved fuzzy matching