Fixed problems with highlighting, moving, and weird things with search