Fixes for search page