Sir Trevor: improve parsed h2