Small addition to previous commit

- added conditional for filter criteria query based on date range