admin report - fixed waypoint, match template tree logic to blaze