CMS-2300 Research how to support complex values for properties (type=DataSet)
Fixed bug and corrupted formatting