Updated Search._clone to better support subclassing