Fix timestamp format
Change sort to order