Fixing issue with search
Fixing issue with search