PIM-2127 : move scope filter