Improved HeadingParser for deeplinks