Fix part of search errors