Minor style fixes and handle not finding the search term