Fix encoding bug
Support change in date format