Some fixes for the search engine