Improve Find Panel, Find Next/Previous behavior.

Temporarily disable WholeWordHighlighter because it was interfering.
Need to do work to be able to bring it back.