Altered date formatting to be trigger also by key