Fixed multiple badges feature