Clean up and extend date range parsing