Bug fixes on search views
UI tweaks