Fix timestamp and sort