Fix value in cmd field
Tweaks in form wrapper