Search page fix2