Fixing some searches