Refactored the NAPP search view to be more like the engine search view, fixed bug with trusted accounts