Fix some todos in Form View Helpers

See #998
Merge branch 'hotfix/#1283-#998-todo-fixes-in-form-view-helpers' into develop

Close #1283
Forward Port #1283