- date format and sort fix