Token scope display bug

We have a library of tokens with subgroups.

token has a scope setting (like text tokens shouldnt appear in the list when user tries to select background color token etc)

Scope setting works however empty groups are shown in teh dropdown (see screenshot, border tokens are not available):

This behaviour is pretty annoying! Can you please hide grouping when no items available in teh group.