fix logic for dynamic form, hide no-choice in header