Fixed "advanced filters" with "date functions" (deferred filters)
Merge branch 'sapns__advanced_filters_date_functions' into master2