Fixed a few potential NPEs, fixed backing out of search results into manager mode