Updated heading parser to account for weirdness in CFL