[core][fr] rewriting with regex [fr] ajustements