issue #19550: Add handling for when user changes the schedule date on the header. Move a little code around.