modified the search classes to accomodate the new API