Improved filter and added the "source_file