Fix the next urls on form edition
Update TODO