change resolveuid transform to only apply to text field to get around unicode issue
clean up imports