Main and Search page fixes