fixed indexing and display issues with dates