Collapse on h1s when present

* When h1s are present collapse on these rather than h2s

Bug: 52857
Change-Id: I5e8d723d061f7003599b2a7f639bbe1301ba92e0