Fixed display issues with date range