Cat and Search page fixes