refactoring fuzzy search algo
Merge branch 'development'