Handle duplicates in subjects and materials consistently (#926)

Handle duplicates in subjects and materials consistently (#926) #646