Now only right content matching files processed
Little fixes ...