Adjustments on RegisterServiceType and SearchDoneService classes