add highlight_and_return to AppIdLocator