MIFOSX-1369 and update groupnamesbystaff report to core report