Leaderboard Data Breach

Hi Lads. I have a big issue where all my users can see all other users on the leaderboard. I thought this was supposed to be group only leader boards?? I basically cant use leaderboard functions now because they are sharing U16 and U18 data with other adult users, and data from one club with that of another. This is a major issue for me and basically makes the leaderboard function redundant. If possible coud you make it so I can filter who gets a leaderboard and who does not? Similar to how you filter who gets a wellness check-in notification. I have had leaderboards turned on for weeks now not knowing that everyone in the ecosystem can view. Only just now when I impersonated a user with the end of making a screen recording for a tutorial did I realise this massive issue exists.