Adding support for header id tags