Add div around extra hidden fields in FormTag

Issue: SPR-10926