Fixing public badge listing