Merge "Add 'ongoing' filter type"