Add header hierarchy; bugfix with header-table parsing conflict