Got rid of form checkbox hack.
Fixed issue with dynamic form.