UCJEPS-356: Restore layout value to taxon, fixing incorrect change to {CommonSchemaName}