Search page fixes