fixed some bugs in Search. Still need to remember active search view and build radio layout