Search page and display fixes