Fix for search
Fix to search