Implement SHERPA-316 - Date filters