separated manage and search views, fixed broken tests