Changed search to be required
Changed search to be more robust