Added search class. Improved searching/highlighting.