Adjusted search view logic