Bug fixes for search view