Added ALL filter and updated date format