Style fixes, search query fixes