add apply_by_date to current conditions