Added filtering on date range - also switched default to not required