Updated the select and date fields