Handle duplicates in subjects and materials consistently

Handle duplicates in subjects and materials consistently #1389