h1 header handling, fixing grant metadata