Fix some todos in Form View Helpers

See #998