RmrSrcId and RmrRtgSvc handling improved