Bug/fix end date filter