improved some logics to shorten the total time to generate date-nav