Continued work on the search view