another attempt at fixing search