idservice fixed and tested