Merge these changes for adding new filters like
"Today or later", "Yesterday or earlier" etc.