WP-1575 Had to make some adjustments in form altering - to undue some panopoly magic.