fuzzy search + some fixes