Making highlighting more efficient
Fixing fuzzy searh