dates fix
charset fix