Added: prepopulated dates now simplified if no time chosen, also