Fixing search errors