fix date fields & add chart collection