Added better fuzzy searching