Better handling of individual identifier in subject generation