PLF-2796 : Filtering of files must be done at the last moment