Fix date calculation and add missing older-than-1day