fix stack identifiers and add formData to snapshot