Changed the SearchDriver Logic