Remove extra branching
Implement fuzzy searching