(COMMIT-13) Header.tag modification