add highlight_and_return to register_locator