Add fuzzy search and handle null object

@jsteiner @gabebw