+ update for specific case if a subject name contains comma in its name.