[fr] follow routing and form changes