fixed failing edit forms
fix edit for different forms
Merge branch 'hotfix/1.3.2'