Corrected the date prefilling and added a checkbox check