Updated search and view