WCM-72 Fix analytics form tracking