Restore sort_order requirement in forms, fixes sorting issue.

This reverts commit 389a67e38bcba007ad510400a457e32d6b308745.
"Avoid form errors when hidden sort_order is not filled in."