Updated single field to not default wrap_with_label to false if label is set.