Added: faster indexing and sorting by date