Improved header identification (including multiple levels)