Updated to change hardcoded isMultiValued property from true to false as it breaks our code. Need to look into further when we have time.