refactor date index