Fix find and add findNext and findPrevious