[core][fr] suggestions improvements