Fixed 404 and search results issue