updated form tracking to properly track radio buttons and checkboxes