Fixed: The same hook was being used in both HTML and PlainText views.
Added: Separate hooks for Billing and Shipping sections