fixed two-weeks-ago error+handle null dates