Tweaks

• P2P is now compatible with migrating option-based forms to use the visual form builder