PIM-3250 : update filter and sorter methods to pass context