escape defaultValues, some fixes