Fix type conversion for picklist and add map conversion validator