GST Modification on the datePicker