BUG: Not returning 'Today' after Core changes