DATASET-823 update default config based on feedback.