Merge "Fix heading selecting over-select"