reworked search view; minor corrections