updated search yet again