Moved dates out of the filter string