Added a TakeUntil and After DataSample extension filter