more adjustments for reportingunits query for various roles