[INTERNAL] GTM update order & refactor of form data types

[chaoticbear]

Overview

Goal is to fix the GTM updates and refactor the form date typing.