Based on the requirement to alter ValueSets based on PropCSV some fixes are necessary.
See also TERGI-102