Fixes to the distribution group popup selector