Fix badge type ordering