Fixing search bug

Fixing search bug