fix serviceid for Challenge