Fix custom badges

Changes custom badge code to pay attention to the preassigned_badge_types list instead of hardcoded badge types.