Vikram | fix for defects clinician choice any and date formats