[OE-3913] Make element type display order match live db.