Little change of Search class