fixing category page and others