Carousel fix, search fix