Issue #1075890 by KarenS: Initial pass at breaking out the code into the simple filter and a complex filter that combines date fields.