BUGFIX: orphan badge groupings