Fixed CTRL-r not initially going to correct place.  Still needs some work to stay on the first found thing after repeated keystrokes on initial CTRL-r search